Use String8/16 c_str [media]
Bug: 295394788
Test: make checkbuild
Change-Id: I4ba5400f39c769bec59508525844f1daefe1d15c
diff --git a/media/libdatasource/DataSourceFactory.cpp b/media/libdatasource/DataSourceFactory.cpp
index f91e3ea..81a6cd0 100644
--- a/media/libdatasource/DataSourceFactory.cpp
+++ b/media/libdatasource/DataSourceFactory.cpp
@@ -92,7 +92,7 @@
source = NuCachedSource2::Create(
mediaHTTP,
- cacheConfig.isEmpty() ? NULL : cacheConfig.string(),
+ cacheConfig.isEmpty() ? NULL : cacheConfig.c_str(),
disconnectAtHighwatermark);
} else if (!strncasecmp("data:", uri, 5)) {
source = DataURISource::Create(uri);
diff --git a/media/libdatasource/NuCachedSource2.cpp b/media/libdatasource/NuCachedSource2.cpp
index 6d63ffb..4e71d5f 100644
--- a/media/libdatasource/NuCachedSource2.cpp
+++ b/media/libdatasource/NuCachedSource2.cpp
@@ -225,7 +225,7 @@
// IMediaHTTPConnection::readAt and therefore call back into JAVA.
mLooper->start(false /* runOnCallingThread */, true /* canCallJava */);
- mName = String8::format("NuCachedSource2(%s)", mSource->toString().string());
+ mName = String8::format("NuCachedSource2(%s)", mSource->toString().c_str());
}
NuCachedSource2::~NuCachedSource2() {
@@ -765,7 +765,7 @@
headers->removeItemsAt(index);
- ALOGV("Using special cache config '%s'", cacheConfig->string());
+ ALOGV("Using special cache config '%s'", cacheConfig->c_str());
}
if ((index = headers->indexOfKey(
diff --git a/media/libmedia/IMediaExtractor.cpp b/media/libmedia/IMediaExtractor.cpp
index eb436d1..499569b 100644
--- a/media/libmedia/IMediaExtractor.cpp
+++ b/media/libmedia/IMediaExtractor.cpp
@@ -304,7 +304,7 @@
}
for (size_t i = 0; i < tracks.size(); i++) {
const String8 desc = trackDescriptions.itemAt(i);
- str.appendFormat(" track {%s} ", desc.string());
+ str.appendFormat(" track {%s} ", desc.c_str());
wp<IMediaSource> wSource = tracks.itemAt(i);
if (wSource == NULL) {
str.append(": null\n");
@@ -386,7 +386,7 @@
}
}
}
- write(fd, out.string(), out.size());
+ write(fd, out.c_str(), out.size());
return OK;
}
diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp
index 8cbb4c2..b029b97 100644
--- a/media/libmedia/IMediaHTTPConnection.cpp
+++ b/media/libmedia/IMediaHTTPConnection.cpp
@@ -54,8 +54,8 @@
tmp = String16("");
if (headers != NULL) {
for (size_t i = 0; i < headers->size(); ++i) {
- String16 key(headers->keyAt(i).string());
- String16 val(headers->valueAt(i).string());
+ String16 key(headers->keyAt(i).c_str());
+ String16 val(headers->valueAt(i).c_str());
tmp.append(key);
tmp.append(String16(": "));
diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp
index 86427ed..cdb1837 100644
--- a/media/libmedia/IMediaMetadataRetriever.cpp
+++ b/media/libmedia/IMediaMetadataRetriever.cpp
@@ -218,7 +218,7 @@
} else {
mMetadata.replaceValueFor(keyCode, value);
}
- return mMetadata.valueFor(keyCode).string();
+ return mMetadata.valueFor(keyCode).c_str();
} else {
return NULL;
}
diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp
index e191999..755a147 100644
--- a/media/libmedia/IMediaRecorder.cpp
+++ b/media/libmedia/IMediaRecorder.cpp
@@ -255,7 +255,7 @@
status_t setParameters(const String8& params)
{
- ALOGV("setParameter(%s)", params.string());
+ ALOGV("setParameter(%s)", params.c_str());
Parcel data, reply;
data.writeInterfaceToken(IMediaRecorder::getInterfaceDescriptor());
data.writeString8(params);
@@ -275,7 +275,7 @@
status_t setClientName(const String16& clientName)
{
- ALOGV("setClientName(%s)", String8(clientName).string());
+ ALOGV("setClientName(%s)", String8(clientName).c_str());
Parcel data, reply;
data.writeInterfaceToken(IMediaRecorder::getInterfaceDescriptor());
data.writeString16(clientName);
diff --git a/media/libmedia/include/media/omx/1.0/Conversion.h b/media/libmedia/include/media/omx/1.0/Conversion.h
index 811936b..70217d5 100644
--- a/media/libmedia/include/media/omx/1.0/Conversion.h
+++ b/media/libmedia/include/media/omx/1.0/Conversion.h
@@ -796,11 +796,11 @@
*/
// convert: IOMX::ComponentInfo -> IOmx::ComponentInfo
inline bool convertTo(IOmx::ComponentInfo* t, IOMX::ComponentInfo const& l) {
- t->mName = l.mName.string();
+ t->mName = l.mName.c_str();
t->mRoles.resize(l.mRoles.size());
size_t i = 0;
for (auto& role : l.mRoles) {
- t->mRoles[i++] = role.string();
+ t->mRoles[i++] = role.c_str();
}
return true;
}
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp
index bd06fb6..48f5e4b 100644
--- a/media/libmedia/mediarecorder.cpp
+++ b/media/libmedia/mediarecorder.cpp
@@ -472,7 +472,7 @@
}
status_t MediaRecorder::setParameters(const String8& params) {
- ALOGV("setParameters(%s)", params.string());
+ ALOGV("setParameters(%s)", params.c_str());
if (mMediaRecorder == NULL) {
ALOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -496,7 +496,7 @@
status_t ret = mMediaRecorder->setParameters(params);
if (OK != ret) {
- ALOGE("setParameters(%s) failed: %d", params.string(), ret);
+ ALOGE("setParameters(%s) failed: %d", params.c_str(), ret);
// Do not change our current state to MEDIA_RECORDER_ERROR, failures
// of the only currently supported parameters, "max-duration" and
// "max-filesize" are _not_ fatal.
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index c08da0f..2a2a37b 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -237,7 +237,7 @@
if (hasFlattenedTag) {
// the tags are UTF16, convert to UTF8
String16 tags = parcel.readString16();
- ssize_t realTagSize = utf16_to_utf8_length(tags.string(), tags.size());
+ ssize_t realTagSize = utf16_to_utf8_length(tags.c_str(), tags.size());
if (realTagSize <= 0) {
strcpy(attributes->tags, "");
} else {
@@ -245,7 +245,7 @@
// copying array size -1, array for tags was calloc'd, no need to NULL-terminate it
size_t tagSize = realTagSize > AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 ?
AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 : realTagSize;
- utf16_to_utf8(tags.string(), tagSize, attributes->tags,
+ utf16_to_utf8(tags.c_str(), tagSize, attributes->tags,
sizeof(attributes->tags) / sizeof(attributes->tags[0]));
}
} else {
@@ -434,7 +434,7 @@
}
}
result.append("\n");
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
}
@@ -549,7 +549,7 @@
mAuxEffectId, mSendLevel);
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
if (mTrack != 0) {
mTrack->dump(fd, args);
}
@@ -584,7 +584,7 @@
} else {
result.append(" lock is taken, no dump from player and audio output\n");
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
if (p != NULL) {
p->dump(fd, args);
@@ -644,7 +644,7 @@
snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n",
c->mAttributionSource.pid);
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
result = "\n";
c->dump(fd, args);
@@ -746,7 +746,7 @@
result.append(s.c_str(), s.size());
}
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return NO_ERROR;
}
@@ -1249,7 +1249,7 @@
const BufferingSettings& buffering)
{
ALOGV("[%d] setBufferingSettings{%s}",
- mConnId, buffering.toString().string());
+ mConnId, buffering.toString().c_str());
sp<MediaPlayerBase> p = getPlayer();
if (p == 0) return UNKNOWN_ERROR;
return p->setBufferingSettings(buffering);
@@ -1264,7 +1264,7 @@
status_t ret = p->getBufferingSettings(buffering);
if (ret == NO_ERROR) {
ALOGV("[%d] getBufferingSettings{%s}",
- mConnId, buffering->toString().string());
+ mConnId, buffering->toString().c_str());
} else {
ALOGE("[%d] getBufferingSettings returned %d", mConnId, ret);
}
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 58fc06d..d6b1c90 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -245,7 +245,7 @@
}
status_t MediaRecorderClient::setParameters(const String8& params) {
- ALOGV("setParameters(%s)", params.string());
+ ALOGV("setParameters(%s)", params.c_str());
Mutex::Autolock lock(mLock);
if (mRecorder == NULL) {
ALOGE("recorder is not initialized");
@@ -519,7 +519,7 @@
}
status_t MediaRecorderClient::setClientName(const String16& clientName) {
- ALOGV("setClientName(%s)", String8(clientName).string());
+ ALOGV("setClientName(%s)", String8(clientName).c_str());
Mutex::Autolock lock(mLock);
if (mRecorder == NULL) {
ALOGE("recorder is not initialized");
diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index fb228ca..9e289d0 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -67,7 +67,7 @@
result.append(" MetadataRetrieverClient\n");
snprintf(buffer, 255, " pid(%d)\n", mPid);
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
write(fd, "\n", 1);
return NO_ERROR;
}
diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
index b3f7f25..82410f8 100644
--- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
+++ b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
@@ -471,7 +471,7 @@
return NULL;
}
- return mMetaData.valueAt(index).string();
+ return mMetaData.valueAt(index).c_str();
}
void StagefrightMetadataRetriever::parseColorAspects(const sp<MetaData>& meta) {
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 6f8c102..1dfd53d 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -519,7 +519,7 @@
// Trim both leading and trailing whitespace from the given string.
static void TrimString(String8 *s) {
size_t num_bytes = s->bytes();
- const char *data = s->string();
+ const char *data = s->c_str();
size_t leading_space = 0;
while (leading_space < num_bytes && isspace(data[leading_space])) {
@@ -823,9 +823,9 @@
}
status_t StagefrightRecorder::setParamRtpLocalIp(const String8 &localIp) {
- ALOGV("setParamVideoLocalIp: %s", localIp.string());
+ ALOGV("setParamVideoLocalIp: %s", localIp.c_str());
- mLocalIp.setTo(localIp.string());
+ mLocalIp.setTo(localIp.c_str());
return OK;
}
@@ -837,9 +837,9 @@
}
status_t StagefrightRecorder::setParamRtpRemoteIp(const String8 &remoteIp) {
- ALOGV("setParamVideoRemoteIp: %s", remoteIp.string());
+ ALOGV("setParamVideoRemoteIp: %s", remoteIp.c_str());
- mRemoteIp.setTo(remoteIp.string());
+ mRemoteIp.setTo(remoteIp.c_str());
return OK;
}
@@ -929,197 +929,197 @@
}
status_t StagefrightRecorder::setLogSessionId(const String8 &log_session_id) {
- ALOGV("setLogSessionId: %s", log_session_id.string());
+ ALOGV("setLogSessionId: %s", log_session_id.c_str());
// TODO: validity check that log_session_id is a 32-byte hex digit.
- mLogSessionId.setTo(log_session_id.string());
+ mLogSessionId.setTo(log_session_id.c_str());
return OK;
}
status_t StagefrightRecorder::setParameter(
const String8 &key, const String8 &value) {
- ALOGV("setParameter: key (%s) => value (%s)", key.string(), value.string());
+ ALOGV("setParameter: key (%s) => value (%s)", key.c_str(), value.c_str());
if (key == "max-duration") {
int64_t max_duration_ms;
- if (safe_strtoi64(value.string(), &max_duration_ms)) {
+ if (safe_strtoi64(value.c_str(), &max_duration_ms)) {
return setParamMaxFileDurationUs(1000LL * max_duration_ms);
}
} else if (key == "max-filesize") {
int64_t max_filesize_bytes;
- if (safe_strtoi64(value.string(), &max_filesize_bytes)) {
+ if (safe_strtoi64(value.c_str(), &max_filesize_bytes)) {
return setParamMaxFileSizeBytes(max_filesize_bytes);
}
} else if (key == "interleave-duration-us") {
int32_t durationUs;
- if (safe_strtoi32(value.string(), &durationUs)) {
+ if (safe_strtoi32(value.c_str(), &durationUs)) {
return setParamInterleaveDuration(durationUs);
}
} else if (key == "param-movie-time-scale") {
int32_t timeScale;
- if (safe_strtoi32(value.string(), &timeScale)) {
+ if (safe_strtoi32(value.c_str(), &timeScale)) {
return setParamMovieTimeScale(timeScale);
}
} else if (key == "param-use-64bit-offset") {
int32_t use64BitOffset;
- if (safe_strtoi32(value.string(), &use64BitOffset)) {
+ if (safe_strtoi32(value.c_str(), &use64BitOffset)) {
return setParam64BitFileOffset(use64BitOffset != 0);
}
} else if (key == "param-geotag-longitude") {
int64_t longitudex10000;
- if (safe_strtoi64(value.string(), &longitudex10000)) {
+ if (safe_strtoi64(value.c_str(), &longitudex10000)) {
return setParamGeoDataLongitude(longitudex10000);
}
} else if (key == "param-geotag-latitude") {
int64_t latitudex10000;
- if (safe_strtoi64(value.string(), &latitudex10000)) {
+ if (safe_strtoi64(value.c_str(), &latitudex10000)) {
return setParamGeoDataLatitude(latitudex10000);
}
} else if (key == "param-track-time-status") {
int64_t timeDurationUs;
- if (safe_strtoi64(value.string(), &timeDurationUs)) {
+ if (safe_strtoi64(value.c_str(), &timeDurationUs)) {
return setParamTrackTimeStatus(timeDurationUs);
}
} else if (key == "audio-param-sampling-rate") {
int32_t sampling_rate;
- if (safe_strtoi32(value.string(), &sampling_rate)) {
+ if (safe_strtoi32(value.c_str(), &sampling_rate)) {
return setParamAudioSamplingRate(sampling_rate);
}
} else if (key == "audio-param-number-of-channels") {
int32_t number_of_channels;
- if (safe_strtoi32(value.string(), &number_of_channels)) {
+ if (safe_strtoi32(value.c_str(), &number_of_channels)) {
return setParamAudioNumberOfChannels(number_of_channels);
}
} else if (key == "audio-param-encoding-bitrate") {
int32_t audio_bitrate;
- if (safe_strtoi32(value.string(), &audio_bitrate)) {
+ if (safe_strtoi32(value.c_str(), &audio_bitrate)) {
return setParamAudioEncodingBitRate(audio_bitrate);
}
} else if (key == "audio-param-time-scale") {
int32_t timeScale;
- if (safe_strtoi32(value.string(), &timeScale)) {
+ if (safe_strtoi32(value.c_str(), &timeScale)) {
return setParamAudioTimeScale(timeScale);
}
} else if (key == "video-param-encoding-bitrate") {
int32_t video_bitrate;
- if (safe_strtoi32(value.string(), &video_bitrate)) {
+ if (safe_strtoi32(value.c_str(), &video_bitrate)) {
return setParamVideoEncodingBitRate(video_bitrate);
}
} else if (key == "video-param-bitrate-mode") {
int32_t video_bitrate_mode;
- if (safe_strtoi32(value.string(), &video_bitrate_mode)) {
+ if (safe_strtoi32(value.c_str(), &video_bitrate_mode)) {
return setParamVideoBitRateMode(video_bitrate_mode);
}
} else if (key == "video-param-rotation-angle-degrees") {
int32_t degrees;
- if (safe_strtoi32(value.string(), °rees)) {
+ if (safe_strtoi32(value.c_str(), °rees)) {
return setParamVideoRotation(degrees);
}
} else if (key == "video-param-i-frames-interval") {
int32_t seconds;
- if (safe_strtoi32(value.string(), &seconds)) {
+ if (safe_strtoi32(value.c_str(), &seconds)) {
return setParamVideoIFramesInterval(seconds);
}
} else if (key == "video-param-encoder-profile") {
int32_t profile;
- if (safe_strtoi32(value.string(), &profile)) {
+ if (safe_strtoi32(value.c_str(), &profile)) {
return setParamVideoEncoderProfile(profile);
}
} else if (key == "video-param-encoder-level") {
int32_t level;
- if (safe_strtoi32(value.string(), &level)) {
+ if (safe_strtoi32(value.c_str(), &level)) {
return setParamVideoEncoderLevel(level);
}
} else if (key == "video-param-camera-id") {
int32_t cameraId;
- if (safe_strtoi32(value.string(), &cameraId)) {
+ if (safe_strtoi32(value.c_str(), &cameraId)) {
return setParamVideoCameraId(cameraId);
}
} else if (key == "video-param-time-scale") {
int32_t timeScale;
- if (safe_strtoi32(value.string(), &timeScale)) {
+ if (safe_strtoi32(value.c_str(), &timeScale)) {
return setParamVideoTimeScale(timeScale);
}
} else if (key == "time-lapse-enable") {
int32_t captureFpsEnable;
- if (safe_strtoi32(value.string(), &captureFpsEnable)) {
+ if (safe_strtoi32(value.c_str(), &captureFpsEnable)) {
return setParamCaptureFpsEnable(captureFpsEnable);
}
} else if (key == "time-lapse-fps") {
double fps;
- if (safe_strtod(value.string(), &fps)) {
+ if (safe_strtod(value.c_str(), &fps)) {
return setParamCaptureFps(fps);
}
} else if (key == "rtp-param-local-ip") {
return setParamRtpLocalIp(value);
} else if (key == "rtp-param-local-port") {
int32_t localPort;
- if (safe_strtoi32(value.string(), &localPort)) {
+ if (safe_strtoi32(value.c_str(), &localPort)) {
return setParamRtpLocalPort(localPort);
}
} else if (key == "rtp-param-remote-ip") {
return setParamRtpRemoteIp(value);
} else if (key == "rtp-param-remote-port") {
int32_t remotePort;
- if (safe_strtoi32(value.string(), &remotePort)) {
+ if (safe_strtoi32(value.c_str(), &remotePort)) {
return setParamRtpRemotePort(remotePort);
}
} else if (key == "rtp-param-self-id") {
int32_t selfID;
int64_t temp;
- if (safe_strtoi64(value.string(), &temp)) {
+ if (safe_strtoi64(value.c_str(), &temp)) {
selfID = static_cast<int32_t>(temp);
return setParamSelfID(selfID);
}
} else if (key == "rtp-param-opponent-id") {
int32_t opnId;
int64_t temp;
- if (safe_strtoi64(value.string(), &temp)) {
+ if (safe_strtoi64(value.c_str(), &temp)) {
opnId = static_cast<int32_t>(temp);
return setParamVideoOpponentID(opnId);
}
} else if (key == "rtp-param-payload-type") {
int32_t payloadType;
- if (safe_strtoi32(value.string(), &payloadType)) {
+ if (safe_strtoi32(value.c_str(), &payloadType)) {
return setParamPayloadType(payloadType);
}
} else if (key == "rtp-param-ext-cvo-extmap") {
int32_t extmap;
- if (safe_strtoi32(value.string(), &extmap)) {
+ if (safe_strtoi32(value.c_str(), &extmap)) {
return setRTPCVOExtMap(extmap);
}
} else if (key == "rtp-param-ext-cvo-degrees") {
int32_t degrees;
- if (safe_strtoi32(value.string(), °rees)) {
+ if (safe_strtoi32(value.c_str(), °rees)) {
return setRTPCVODegrees(degrees);
}
} else if (key == "video-param-request-i-frame") {
return requestIDRFrame();
} else if (key == "rtp-param-set-socket-dscp") {
int32_t dscp;
- if (safe_strtoi32(value.string(), &dscp)) {
+ if (safe_strtoi32(value.c_str(), &dscp)) {
return setParamRtpDscp(dscp);
}
} else if (key == "rtp-param-set-socket-ecn") {
int32_t targetEcn;
- if (safe_strtoi32(value.string(), &targetEcn)) {
+ if (safe_strtoi32(value.c_str(), &targetEcn)) {
return setParamRtpEcn(targetEcn);
}
} else if (key == "rtp-param-set-socket-network") {
int64_t networkHandle;
- if (safe_strtoi64(value.string(), &networkHandle)) {
+ if (safe_strtoi64(value.c_str(), &networkHandle)) {
return setSocketNetwork(networkHandle);
}
} else if (key == "log-session-id") {
return setLogSessionId(value);
} else {
- ALOGE("setParameter: failed to find key %s", key.string());
+ ALOGE("setParameter: failed to find key %s", key.c_str());
}
return BAD_VALUE;
}
status_t StagefrightRecorder::setParameters(const String8 ¶ms) {
- ALOGV("setParameters: %s", params.string());
- const char *cparams = params.string();
+ ALOGV("setParameters: %s", params.c_str());
+ const char *cparams = params.c_str();
const char *key_start = cparams;
for (;;) {
const char *equal_pos = strchr(key_start, '=');
@@ -2676,7 +2676,7 @@
result.append(buffer);
snprintf(buffer, SIZE, " Bit rate (bps): %d\n", mVideoBitRate);
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
return OK;
}
} // namespace android
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 36e4d4a..dd4509d 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -270,7 +270,7 @@
}
ALOGV("initFromDataSource mSources.size(): %zu mIsSecure: %d mime[0]: %s", mSources.size(),
- mIsSecure, (mMimes.isEmpty() ? "NONE" : mMimes[0].string()));
+ mIsSecure, (mMimes.isEmpty() ? "NONE" : mMimes[0].c_str()));
if (mSources.size() == 0) {
ALOGE("b/23705695");
@@ -292,12 +292,12 @@
*buffering = mBufferingSettings;
}
- ALOGV("getBufferingSettings{%s}", buffering->toString().string());
+ ALOGV("getBufferingSettings{%s}", buffering->toString().c_str());
return OK;
}
status_t NuPlayer::GenericSource::setBufferingSettings(const BufferingSettings& buffering) {
- ALOGV("setBufferingSettings{%s}", buffering.toString().string());
+ ALOGV("setBufferingSettings{%s}", buffering.toString().c_str());
Mutex::Autolock _l(mLock);
mBufferingSettings = buffering;
@@ -1614,7 +1614,7 @@
return status;
}
ALOGV("prepareDrm: createCryptoAndPlugin succeeded for uuid: %s",
- DrmUUID::toHexString(uuid).string());
+ DrmUUID::toHexString(uuid).c_str());
*outCrypto = crypto;
// as long a there is an active crypto
@@ -1627,7 +1627,7 @@
}
// first mime in this list is either the video track, or the first audio track
- const char *mime = mMimes[0].string();
+ const char *mime = mMimes[0].c_str();
mIsSecure = crypto->requiresSecureDecoderComponent(mime);
ALOGV("prepareDrm: requiresSecureDecoderComponent mime: %s isSecure: %d",
mime, mIsSecure);
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index f73c5a8..e2b2d1f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -370,7 +370,7 @@
}
void NuPlayer::setDataSourceAsync(const String8& rtpParams) {
- ALOGD("setDataSourceAsync for RTP = %s", rtpParams.string());
+ ALOGD("setDataSourceAsync for RTP = %s", rtpParams.c_str());
sp<AMessage> msg = new AMessage(kWhatSetDataSource, this);
sp<AMessage> notify = new AMessage(kWhatSourceNotify, this);
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
index a964d4f..8525192 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
@@ -89,8 +89,8 @@
drmSchemes.add(_uuid);
ALOGV("ParsePSSH[%zu]: %s: %s", numentries,
- _uuid.toHexString().string(),
- DrmUUID::arrayToHex(data, datalen).string()
+ _uuid.toHexString().c_str(),
+ DrmUUID::arrayToHex(data, datalen).c_str()
);
numentries++;
@@ -167,7 +167,7 @@
parcel->writeByteArray(psshsize, (const uint8_t*)pssh);
ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO PSSH: size: %zu %s", psshsize,
- DrmUUID::arrayToHex((uint8_t*)pssh, psshsize).string());
+ DrmUUID::arrayToHex((uint8_t*)pssh, psshsize).c_str());
// 2) supportedDRMs
Vector<DrmUUID> supportedDRMs = getSupportedDrmSchemes(pssh, psshsize);
@@ -177,7 +177,7 @@
parcel->writeByteArray(DrmUUID::UUID_SIZE, uuid.ptr());
ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO supportedScheme[%zu] %s", i,
- uuid.toHexString().string());
+ uuid.toHexString().c_str());
}
}
diff --git a/media/libmediaplayerservice/nuplayer/RTPSource.cpp b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
index fd03150..efe1a80 100644
--- a/media/libmediaplayerservice/nuplayer/RTPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
@@ -56,7 +56,7 @@
mReceivedFirstRTPPacket(false),
mPausing(false),
mPauseGeneration(0) {
- ALOGD("RTPSource initialized with rtpParams=%s", rtpParams.string());
+ ALOGD("RTPSource initialized with rtpParams=%s", rtpParams.c_str());
}
NuPlayer::RTPSource::~RTPSource() {
@@ -661,7 +661,7 @@
}
status_t NuPlayer::RTPSource::setParameter(const String8 &key, const String8 &value) {
- ALOGV("setParameter: key (%s) => value (%s)", key.string(), value.string());
+ ALOGV("setParameter: key (%s) => value (%s)", key.c_str(), value.c_str());
bool isAudioKey = key.contains("audio");
TrackInfo *info = NULL;
@@ -684,12 +684,12 @@
if (key == "rtp-param-mime-type") {
info->mMimeType = value;
- const char *mime = value.string();
+ const char *mime = value.c_str();
const char *delimiter = strchr(mime, '/');
info->mCodecName = delimiter ? (delimiter + 1) : "<none>";
ALOGV("rtp-param-mime-type: mMimeType (%s) => mCodecName (%s)",
- info->mMimeType.string(), info->mCodecName.string());
+ info->mMimeType.c_str(), info->mCodecName.c_str());
} else if (key == "video-param-decoder-profile") {
info->mCodecProfile = atoi(value);
} else if (key == "video-param-decoder-level") {
@@ -732,8 +732,8 @@
}
status_t NuPlayer::RTPSource::setParameters(const String8 ¶ms) {
- ALOGV("setParameters: %s", params.string());
- const char *cparams = params.string();
+ ALOGV("setParameters: %s", params.c_str());
+ const char *cparams = params.c_str();
const char *key_start = cparams;
for (;;) {
const char *equal_pos = strchr(key_start, '=');
@@ -784,7 +784,7 @@
//static
void NuPlayer::RTPSource::TrimString(String8 *s) {
size_t num_bytes = s->bytes();
- const char *data = s->string();
+ const char *data = s->c_str();
size_t leading_space = 0;
while (leading_space < num_bytes && isspace(data[leading_space])) {
diff --git a/media/libstagefright/CallbackDataSource.cpp b/media/libstagefright/CallbackDataSource.cpp
index eb3cb45..ede4855 100644
--- a/media/libstagefright/CallbackDataSource.cpp
+++ b/media/libstagefright/CallbackDataSource.cpp
@@ -38,7 +38,7 @@
mName = String8::format("CallbackDataSource(%d->%d, %s)",
getpid(),
IPCThreadState::self()->getCallingPid(),
- mIDataSource->toString().string());
+ mIDataSource->toString().c_str());
}
@@ -120,7 +120,7 @@
TinyCacheSource::TinyCacheSource(const sp<DataSource>& source)
: mSource(source), mCachedOffset(0), mCachedSize(0) {
- mName = String8::format("TinyCacheSource(%s)", mSource->toString().string());
+ mName = String8::format("TinyCacheSource(%s)", mSource->toString().c_str());
}
status_t TinyCacheSource::initCheck() const {
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 89ebe7b..1a3a2da 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -604,7 +604,7 @@
result.append(buffer);
snprintf(buffer, SIZE, " mStarted: %s\n", mStarted? "true": "false");
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
for (List<Track *>::iterator it = mTracks.begin();
it != mTracks.end(); ++it) {
(*it)->dump(fd, args);
@@ -626,7 +626,7 @@
result.append(buffer);
snprintf(buffer, SIZE, " duration encoded : %" PRId64 " us\n", mTrackDurationUs);
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
return OK;
}
diff --git a/media/libstagefright/MediaExtractorFactory.cpp b/media/libstagefright/MediaExtractorFactory.cpp
index 2520e2a..1c72a65 100644
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@@ -242,22 +242,22 @@
continue;
}
void *libHandle = android_dlopen_ext(
- libPath.string(),
+ libPath.c_str(),
RTLD_NOW | RTLD_LOCAL, dlextinfo);
if (libHandle == nullptr) {
- ALOGI("dlopen(%s) reported error %s", libPath.string(), strerror(errno));
+ ALOGI("dlopen(%s) reported error %s", libPath.c_str(), strerror(errno));
continue;
}
GetExtractorDef getDef =
(GetExtractorDef) dlsym(libHandle, "GETEXTRACTORDEF");
if (getDef == nullptr) {
- ALOGI("no sniffer found in %s", libPath.string());
+ ALOGI("no sniffer found in %s", libPath.c_str());
dlclose(libHandle);
continue;
}
- ALOGV("registering sniffer for %s", libPath.string());
+ ALOGV("registering sniffer for %s", libPath.c_str());
RegisterExtractor(
new ExtractorPlugin(getDef(), libHandle, libPath), pluginList);
}
@@ -387,7 +387,7 @@
out.append(" (no plugins registered)\n");
}
}
- write(fd, out.string(), out.size());
+ write(fd, out.c_str(), out.size());
return OK;
}
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index d736734..079a963 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -164,7 +164,7 @@
const char* NuMediaExtractor::getName() const {
Mutex::Autolock autoLock(mLock);
- return mImpl == nullptr ? nullptr : mName.string();
+ return mImpl == nullptr ? nullptr : mName.c_str();
}
static String8 arrayToString(const std::vector<uint8_t> &array) {
diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 68f1de9..a15b66d 100644
--- a/media/libstagefright/httplive/HTTPDownloader.cpp
+++ b/media/libstagefright/httplive/HTTPDownloader.cpp
@@ -265,7 +265,7 @@
#endif
sp<M3UParser> playlist =
- new M3UParser(actualUrl.string(), buffer->data(), buffer->size());
+ new M3UParser(actualUrl.c_str(), buffer->data(), buffer->size());
if (playlist->initCheck() != OK) {
ALOGE("failed to parse .m3u8 playlist");
diff --git a/media/libstagefright/include/media/stagefright/RemoteDataSource.h b/media/libstagefright/include/media/stagefright/RemoteDataSource.h
index d605cda..621d772 100644
--- a/media/libstagefright/include/media/stagefright/RemoteDataSource.h
+++ b/media/libstagefright/include/media/stagefright/RemoteDataSource.h
@@ -106,7 +106,7 @@
if (mMemory.get() == nullptr) {
ALOGE("Failed to allocate memory!");
}
- mName = String8::format("RemoteDataSource(%s)", mSource->toString().string());
+ mName = String8::format("RemoteDataSource(%s)", mSource->toString().c_str());
}
DISALLOW_EVIL_CONSTRUCTORS(RemoteDataSource);
diff --git a/media/libstagefright/omx/OMXStore.cpp b/media/libstagefright/omx/OMXStore.cpp
index 4827d9e..20dc6eb 100644
--- a/media/libstagefright/omx/OMXStore.cpp
+++ b/media/libstagefright/omx/OMXStore.cpp
@@ -166,7 +166,7 @@
if (mPluginByComponentName.indexOfKey(name8) >= 0) {
ALOGE("A component of name '%s' already exists, ignoring this one.",
- name8.string());
+ name8.c_str());
continue;
}
@@ -262,7 +262,7 @@
const String8 &name8 = mPluginByComponentName.keyAt(index);
CHECK(size >= 1 + name8.size());
- strcpy(name, name8.string());
+ strcpy(name, name8.c_str());
return OMX_ErrorNone;
}
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h b/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
index 264c01d..cf236d8 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
@@ -532,11 +532,11 @@
*/
// convert: IOMX::ComponentInfo -> IOmx::ComponentInfo
inline bool convertTo(IOmx::ComponentInfo* t, IOMX::ComponentInfo const& l) {
- t->mName = l.mName.string();
+ t->mName = l.mName.c_str();
t->mRoles.resize(l.mRoles.size());
size_t i = 0;
for (auto& role : l.mRoles) {
- t->mRoles[i++] = role.string();
+ t->mRoles[i++] = role.c_str();
}
return true;
}
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index 039991c..b9bea1a 100644
--- a/media/libstagefright/omx/tests/OMXHarness.cpp
+++ b/media/libstagefright/omx/tests/OMXHarness.cpp
@@ -789,7 +789,7 @@
for (List<IOMX::ComponentInfo>::iterator it = componentInfos.begin();
it != componentInfos.end(); ++it) {
const IOMX::ComponentInfo &info = *it;
- const char *componentName = info.mName.string();
+ const char *componentName = info.mName.c_str();
if (strncmp(componentName, "OMX.google.", 11)) {
continue;
@@ -797,7 +797,7 @@
for (List<String8>::const_iterator role_it = info.mRoles.begin();
role_it != info.mRoles.end(); ++role_it) {
- const char *componentRole = (*role_it).string();
+ const char *componentRole = (*role_it).c_str();
err = test(componentName, componentRole);
diff --git a/media/libstagefright/renderfright/gl/GLExtensions.cpp b/media/libstagefright/renderfright/gl/GLExtensions.cpp
index 2924b0e..4717c68 100644
--- a/media/libstagefright/renderfright/gl/GLExtensions.cpp
+++ b/media/libstagefright/renderfright/gl/GLExtensions.cpp
@@ -68,19 +68,19 @@
}
char const* GLExtensions::getVendor() const {
- return mVendor.string();
+ return mVendor.c_str();
}
char const* GLExtensions::getRenderer() const {
- return mRenderer.string();
+ return mRenderer.c_str();
}
char const* GLExtensions::getVersion() const {
- return mVersion.string();
+ return mVersion.c_str();
}
char const* GLExtensions::getExtensions() const {
- return mExtensions.string();
+ return mExtensions.c_str();
}
void GLExtensions::initWithEGLStrings(char const* eglVersion, char const* eglExtensions) {
@@ -123,11 +123,11 @@
}
char const* GLExtensions::getEGLVersion() const {
- return mEGLVersion.string();
+ return mEGLVersion.c_str();
}
char const* GLExtensions::getEGLExtensions() const {
- return mEGLExtensions.string();
+ return mEGLExtensions.c_str();
}
} // namespace gl
diff --git a/media/libstagefright/renderfright/gl/ProgramCache.cpp b/media/libstagefright/renderfright/gl/ProgramCache.cpp
index af55172..350f0b7 100644
--- a/media/libstagefright/renderfright/gl/ProgramCache.cpp
+++ b/media/libstagefright/renderfright/gl/ProgramCache.cpp
@@ -62,7 +62,7 @@
return out;
}
friend inline Formatter& operator<<(Formatter& out, const String8& in) {
- return operator<<(out, in.string());
+ return operator<<(out, in.c_str());
}
friend inline Formatter& operator<<(Formatter& to, FormaterManipFunc func) {
return (*func)(to);
@@ -778,7 +778,7 @@
// fragment shader
String8 fs = generateFragmentShader(needs);
- return std::make_unique<Program>(needs, vs.string(), fs.string());
+ return std::make_unique<Program>(needs, vs.c_str(), fs.c_str());
}
void ProgramCache::useProgram(EGLContext context, const Description& description) {
diff --git a/media/libstagefright/rtsp/AAVCAssembler.cpp b/media/libstagefright/rtsp/AAVCAssembler.cpp
index 100c0cd..fc9f58e 100644
--- a/media/libstagefright/rtsp/AAVCAssembler.cpp
+++ b/media/libstagefright/rtsp/AAVCAssembler.cpp
@@ -203,12 +203,12 @@
seqNum, mNextExpectedSeqNo,
baseJbTimeMs, dynamicJbTimeMs, tryJbTimeMs, JITTER_MULTIPLE);
if (isSecondLineBroken) {
- ALOGE("%s", info.string());
+ ALOGE("%s", info.c_str());
printNowTimeMs(startTimeMs, nowTimeMs, playedTimeMs);
printRTPTime(rtpTime, playedTimeRtp, expiredTimeRtp, isExpired);
} else {
- ALOGW("%s", info.string());
+ ALOGW("%s", info.c_str());
}
}
diff --git a/media/libstagefright/rtsp/AHEVCAssembler.cpp b/media/libstagefright/rtsp/AHEVCAssembler.cpp
index 7b5c24a..06f19ab 100644
--- a/media/libstagefright/rtsp/AHEVCAssembler.cpp
+++ b/media/libstagefright/rtsp/AHEVCAssembler.cpp
@@ -213,12 +213,12 @@
seqNum, mNextExpectedSeqNo,
baseJbTimeMs, dynamicJbTimeMs, tryJbTimeMs, JITTER_MULTIPLE);
if (isSecondLineBroken) {
- ALOGE("%s", info.string());
+ ALOGE("%s", info.c_str());
printNowTimeMs(startTimeMs, nowTimeMs, playedTimeMs);
printRTPTime(rtpTime, playedTimeRtp, expiredTimeRtp, isExpired);
} else {
- ALOGW("%s", info.string());
+ ALOGW("%s", info.c_str());
}
}
diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp
index 41f2d67..41e9aff 100644
--- a/media/libstagefright/rtsp/ARTPWriter.cpp
+++ b/media/libstagefright/rtsp/ARTPWriter.cpp
@@ -1647,11 +1647,11 @@
memset(&mRTCPAddr6, 0, sizeof(mRTCPAddr6));
mLocalAddr6.sin6_family = AF_INET6;
- inet_pton(AF_INET6, localIp.string(), &mLocalAddr6.sin6_addr);
+ inet_pton(AF_INET6, localIp.c_str(), &mLocalAddr6.sin6_addr);
mLocalAddr6.sin6_port = htons((uint16_t)localPort);
mRTPAddr6.sin6_family = AF_INET6;
- inet_pton(AF_INET6, remoteIp.string(), &mRTPAddr6.sin6_addr);
+ inet_pton(AF_INET6, remoteIp.c_str(), &mRTPAddr6.sin6_addr);
mRTPAddr6.sin6_port = htons((uint16_t)remotePort);
mRTCPAddr6 = mRTPAddr6;
@@ -1662,11 +1662,11 @@
memset(&mRTCPAddr, 0, sizeof(mRTCPAddr));
mLocalAddr.sin_family = AF_INET;
- mLocalAddr.sin_addr.s_addr = inet_addr(localIp.string());
+ mLocalAddr.sin_addr.s_addr = inet_addr(localIp.c_str());
mLocalAddr.sin_port = htons((uint16_t)localPort);
mRTPAddr.sin_family = AF_INET;
- mRTPAddr.sin_addr.s_addr = inet_addr(remoteIp.string());
+ mRTPAddr.sin_addr.s_addr = inet_addr(remoteIp.c_str());
mRTPAddr.sin_port = htons((uint16_t)remotePort);
mRTCPAddr = mRTPAddr;
@@ -1679,9 +1679,9 @@
int sizeSockSt = mIsIPv6 ? sizeof(mLocalAddr6) : sizeof(mLocalAddr);
if (bind(mRTPSocket, localAddr, sizeSockSt) == -1) {
- ALOGE("failed to bind rtp %s:%d err=%s", localIp.string(), localPort, strerror(errno));
+ ALOGE("failed to bind rtp %s:%d err=%s", localIp.c_str(), localPort, strerror(errno));
} else {
- ALOGD("succeed to bind rtp %s:%d", localIp.string(), localPort);
+ ALOGD("succeed to bind rtp %s:%d", localIp.c_str(), localPort);
}
if (mIsIPv6)
@@ -1690,9 +1690,9 @@
mLocalAddr.sin_port = htons((uint16_t)(localPort + 1));
if (bind(mRTCPSocket, localAddr, sizeSockSt) == -1) {
- ALOGE("failed to bind rtcp %s:%d err=%s", localIp.string(), localPort + 1, strerror(errno));
+ ALOGE("failed to bind rtcp %s:%d err=%s", localIp.c_str(), localPort + 1, strerror(errno));
} else {
- ALOGD("succeed to bind rtcp %s:%d", localIp.string(), localPort + 1);
+ ALOGD("succeed to bind rtcp %s:%d", localIp.c_str(), localPort + 1);
}
}