Merge changes I4c04ea40,I6e9ea0d7 into main am: 604c767a0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2724318
Change-Id: If7d76175ea31054ae8eb666c362481f2e9479b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 2b1f453..989b127 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -834,7 +834,7 @@
case 'd':
{
dumpStream = true;
- dumpStreamFilename.setTo(optarg);
+ dumpStreamFilename = optarg;
break;
}
@@ -842,13 +842,13 @@
{
dumpPCMStream = true;
audioOnly = true;
- dumpStreamFilename.setTo(optarg);
+ dumpStreamFilename = optarg;
break;
}
case 'N':
{
- gComponentNameOverride.setTo(optarg);
+ gComponentNameOverride = optarg;
break;
}
@@ -886,7 +886,7 @@
case 'w':
{
gWriteMP4 = true;
- gWriteMP4Filename.setTo(optarg);
+ gWriteMP4Filename = optarg;
break;
}
diff --git a/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp b/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
index ad015bf..a54ae47 100644
--- a/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
+++ b/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
@@ -128,7 +128,7 @@
if (nextToken + 1 == mTokens.end())
break;
valueToken = (*(nextToken + 1)).c_str();
- value->setTo(valueToken);
+ *value = valueToken;
nextToken++;
break;
}
@@ -172,7 +172,7 @@
pjs = jsonObject.c_str() + mJsmnTokens[j].start;
if (mJsmnTokens[j].type == JSMN_STRING ||
mJsmnTokens[j].type == JSMN_PRIMITIVE) {
- token.setTo(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
+ token = String8(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
tokens->add(token);
ALOGV("add token: %s", token.c_str());
}
@@ -221,7 +221,7 @@
for (int i = 0; i < numTokens; ++i) {
pjs = jsonAsset.c_str() + mJsmnTokens[i].start;
if (mJsmnTokens[i].type == JSMN_OBJECT) {
- token.setTo(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
+ token = String8(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
jsonObjects->add(token);
}
}
diff --git a/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp b/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
index 6f87f9d..a12b1d1 100644
--- a/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
+++ b/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
@@ -160,7 +160,7 @@
if (nextToken + 1 == mTokens.end())
break;
valueToken = (*(nextToken + 1)).c_str();
- value->setTo(valueToken);
+ *value = valueToken;
nextToken++;
break;
}
@@ -211,7 +211,7 @@
pjs = jsonObject.c_str() + mJsmnTokens[j].start;
if (mJsmnTokens[j].type == JSMN_STRING ||
mJsmnTokens[j].type == JSMN_PRIMITIVE) {
- token.setTo(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
+ token = String8(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
tokens->add(token);
}
}
@@ -259,7 +259,7 @@
for (int i = 0; i < numTokens; ++i) {
pjs = jsonWebKeySet.c_str() + mJsmnTokens[i].start;
if (mJsmnTokens[i].type == JSMN_OBJECT) {
- token.setTo(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
+ token = String8(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
jsonObjects->add(token);
}
}
diff --git a/media/libaudiohal/impl/CoreConversionHelperHidl.cpp b/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
index bd18902..b801187 100644
--- a/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
+++ b/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
@@ -97,7 +97,7 @@
for (size_t i = 0; i < parameters.size(); ++i) {
params.add(String8(parameters[i].key.c_str()), String8(parameters[i].value.c_str()));
}
- values->setTo(params.toString());
+ *values = params.toString();
}
CoreConversionHelperHidl::CoreConversionHelperHidl(std::string_view className)
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 1dfd53d..a9e5a83 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -531,7 +531,7 @@
--i;
}
- s->setTo(String8(&data[leading_space], i - leading_space));
+ *s = String8(&data[leading_space], i - leading_space);
}
status_t StagefrightRecorder::setParamAudioSamplingRate(int32_t sampleRate) {
@@ -825,7 +825,7 @@
status_t StagefrightRecorder::setParamRtpLocalIp(const String8 &localIp) {
ALOGV("setParamVideoLocalIp: %s", localIp.c_str());
- mLocalIp.setTo(localIp.c_str());
+ mLocalIp = localIp.c_str();
return OK;
}
@@ -839,7 +839,7 @@
status_t StagefrightRecorder::setParamRtpRemoteIp(const String8 &remoteIp) {
ALOGV("setParamVideoRemoteIp: %s", remoteIp.c_str());
- mRemoteIp.setTo(remoteIp.c_str());
+ mRemoteIp = remoteIp.c_str();
return OK;
}
@@ -932,7 +932,7 @@
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.c_str());
+ mLogSessionId = log_session_id.c_str();
return OK;
}
@@ -1137,9 +1137,9 @@
const char *semicolon_pos = strchr(value_start, ';');
String8 value;
if (semicolon_pos == NULL) {
- value.setTo(value_start);
+ value = value_start;
} else {
- value.setTo(value_start, semicolon_pos - value_start);
+ value = String8(value_start, semicolon_pos - value_start);
}
if (setParameter(key, value) != OK) {
return BAD_VALUE;
diff --git a/media/libmediaplayerservice/nuplayer/RTPSource.cpp b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
index efe1a80..9a33120 100644
--- a/media/libmediaplayerservice/nuplayer/RTPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
@@ -751,9 +751,9 @@
const char *semicolon_pos = strchr(value_start, ';');
String8 value;
if (semicolon_pos == NULL) {
- value.setTo(value_start);
+ value = value_start;
} else {
- value.setTo(value_start, semicolon_pos - value_start);
+ value = String8(value_start, semicolon_pos - value_start);
}
if (setParameter(key, value) != OK) {
return BAD_VALUE;
@@ -796,7 +796,7 @@
--i;
}
- s->setTo(String8(&data[leading_space], i - leading_space));
+ *s = String8(&data[leading_space], i - leading_space);
}
} // namespace android
diff --git a/media/module/extractors/mp4/ItemTable.cpp b/media/module/extractors/mp4/ItemTable.cpp
index 444664c..7fe5ba7 100644
--- a/media/module/extractors/mp4/ItemTable.cpp
+++ b/media/module/extractors/mp4/ItemTable.cpp
@@ -1111,7 +1111,7 @@
}
buf.push_back(tmp);
if (tmp == 0) {
- out->setTo(buf.array());
+ *out = buf.array();
*offset = newOffset;
*size = stopOffset - newOffset;
diff --git a/media/module/extractors/mp4/MPEG4Extractor.cpp b/media/module/extractors/mp4/MPEG4Extractor.cpp
index 6a1c5f1..ecd937d 100644
--- a/media/module/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/module/extractors/mp4/MPEG4Extractor.cpp
@@ -847,7 +847,7 @@
struct tm* tm = gmtime(&time_1970);
if (tm != NULL &&
strftime(tmp, sizeof(tmp), "%Y%m%dT%H%M%S.000Z", tm) > 0) {
- s->setTo(tmp);
+ *s = tmp;
return true;
}
return false;
@@ -4082,10 +4082,10 @@
buffer[size] = '\0';
switch (mPath[5]) {
case FOURCC("mean"):
- mLastCommentMean.setTo((const char *)buffer + 4);
+ mLastCommentMean = ((const char *)buffer + 4);
break;
case FOURCC("name"):
- mLastCommentName.setTo((const char *)buffer + 4);
+ mLastCommentName = ((const char *)buffer + 4);
break;
case FOURCC("data"):
if (size < 8) {
@@ -4094,7 +4094,7 @@
ALOGE("b/24346430");
return ERROR_MALFORMED;
}
- mLastCommentData.setTo((const char *)buffer + 8);
+ mLastCommentData = ((const char *)buffer + 8);
break;
}
diff --git a/media/module/id3/ID3.cpp b/media/module/id3/ID3.cpp
index 1f3cad9..aaaeeaf 100644
--- a/media/module/id3/ID3.cpp
+++ b/media/module/id3/ID3.cpp
@@ -535,40 +535,40 @@
}
void ID3::Iterator::getID(String8 *id) const {
- id->setTo("");
+ *id = "";
if (mFrameData == NULL) {
return;
}
if (mParent.mVersion == ID3_V2_2) {
- id->setTo((const char *)&mParent.mData[mOffset], 3);
+ *id = String8((const char *)&mParent.mData[mOffset], 3);
} else if (mParent.mVersion == ID3_V2_3 || mParent.mVersion == ID3_V2_4) {
- id->setTo((const char *)&mParent.mData[mOffset], 4);
+ *id = String8((const char *)&mParent.mData[mOffset], 4);
} else {
CHECK(mParent.mVersion == ID3_V1 || mParent.mVersion == ID3_V1_1);
switch (mOffset) {
case 3:
- id->setTo("TT2");
+ *id = "TT2";
break;
case 33:
- id->setTo("TP1");
+ *id = "TP1";
break;
case 63:
- id->setTo("TAL");
+ *id = "TAL";
break;
case 93:
- id->setTo("TYE");
+ *id = "TYE";
break;
case 97:
- id->setTo("COM");
+ *id = "COM";
break;
case 126:
- id->setTo("TRK");
+ *id = "TRK";
break;
case 127:
- id->setTo("TCO");
+ *id = "TCO";
break;
default:
CHECK(!"should not be here.");
@@ -590,7 +590,7 @@
// followed by more data. The data following the \0 can be retrieved by setting
// "otherdata" to true.
void ID3::Iterator::getstring(String8 *id, bool otherdata) const {
- id->setTo("");
+ *id = "";
const uint8_t *frameData = mFrameData;
if (frameData == NULL) {
@@ -605,13 +605,13 @@
char tmp[16];
snprintf(tmp, sizeof(tmp), "%d", (int)*frameData);
- id->setTo(tmp);
+ *id = tmp;
return;
}
// this is supposed to be ISO-8859-1, but pass it up as-is to the caller, who will figure
// out the real encoding
- id->setTo((const char*)frameData, mFrameSize);
+ *id = String8((const char*)frameData, mFrameSize);
return;
}
@@ -640,10 +640,10 @@
if (encoding == 0x00) {
// supposedly ISO 8859-1
- id->setTo((const char*)frameData + 1, n);
+ *id = String8((const char*)frameData + 1, n);
} else if (encoding == 0x03) {
// supposedly UTF-8
- id->setTo((const char *)(frameData + 1), n);
+ *id = String8((const char *)(frameData + 1), n);
} else if (encoding == 0x02) {
// supposedly UTF-16 BE, no byte order mark.
// API wants number of characters, not number of bytes...
@@ -662,7 +662,7 @@
framedata = framedatacopy;
}
#endif
- id->setTo(framedata, len);
+ *id = String8(framedata, len);
if (framedatacopy != NULL) {
delete[] framedatacopy;
}
@@ -715,13 +715,13 @@
for (int i = 0; i < len; i++) {
frame8[i] = framedata[i];
}
- id->setTo(frame8, len);
+ *id = String8(frame8, len);
delete [] frame8;
} else {
- id->setTo(framedata, len);
+ *id = String8(framedata, len);
}
} else {
- id->setTo(framedata, len);
+ *id = String8(framedata, len);
}
if (framedatacopy != NULL) {
@@ -948,7 +948,7 @@
const void *
ID3::getAlbumArt(size_t *length, String8 *mime) const {
*length = 0;
- mime->setTo("");
+ *mime = "";
Iterator it(
*this,
@@ -971,7 +971,7 @@
ALOGW("bogus album art size: mime");
return NULL;
}
- mime->setTo((const char *)&data[consumed]);
+ *mime = (const char *)&data[consumed];
consumed += mimeLen;
#if 0
@@ -1008,11 +1008,11 @@
}
if (!memcmp(&data[1], "PNG", 3)) {
- mime->setTo("image/png");
+ *mime = "image/png";
} else if (!memcmp(&data[1], "JPG", 3)) {
- mime->setTo("image/jpeg");
+ *mime = "image/jpeg";
} else if (!memcmp(&data[1], "-->", 3)) {
- mime->setTo("text/plain");
+ *mime = "text/plain";
} else {
return NULL;
}