Skip to content

Commit

Permalink
Merge changes I4c04ea40,I6e9ea0d7 into main
Browse files Browse the repository at this point in the history 
* changes:
  Migrate String8|16.setTo to assignment operator [mainline]
  Migrate String8|16.setTo to assignment operator
  • Loading branch information
Treehugger Robot authored and Gerrit Code Review committed Aug 24, 2023
2 parents 0188ed1 + 9e975d9 commit 604c767
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 49 deletions.
8 changes: 4 additions & 4 deletions cmds/stagefright/stagefright.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,21 +834,21 @@ int main(int argc, char **argv) {
case 'd':
{
dumpStream = true;
dumpStreamFilename.setTo(optarg);
dumpStreamFilename = optarg;
break;
}

case 'D':
{
dumpPCMStream = true;
audioOnly = true;
dumpStreamFilename.setTo(optarg);
dumpStreamFilename = optarg;
break;
}

case 'N':
{
gComponentNameOverride.setTo(optarg);
gComponentNameOverride = optarg;
break;
}

Expand Down Expand Up @@ -886,7 +886,7 @@ int main(int argc, char **argv) {
case 'w':
{
gWriteMP4 = true;
gWriteMP4Filename.setTo(optarg);
gWriteMP4Filename = optarg;
break;
}

Expand Down
6 changes: 3 additions & 3 deletions drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void JsonAssetLoader::findValue(const String8 &key, String8* value) {
if (nextToken + 1 == mTokens.end())
break;
valueToken = (*(nextToken + 1)).c_str();
value->setTo(valueToken);
*value = valueToken;
nextToken++;
break;
}
Expand Down Expand Up @@ -172,7 +172,7 @@ bool JsonAssetLoader::parseJsonObject(const String8& jsonObject,
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());
}
Expand Down Expand Up @@ -221,7 +221,7 @@ bool JsonAssetLoader::parseJsonAssetString(const String8& jsonAsset,
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);
}
}
Expand Down
6 changes: 3 additions & 3 deletions drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void JsonWebKey::findValue(const String8 &key, String8* value) {
if (nextToken + 1 == mTokens.end())
break;
valueToken = (*(nextToken + 1)).c_str();
value->setTo(valueToken);
*value = valueToken;
nextToken++;
break;
}
Expand Down Expand Up @@ -211,7 +211,7 @@ bool JsonWebKey::parseJsonObject(const String8& jsonObject,
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);
}
}
Expand Down Expand Up @@ -259,7 +259,7 @@ bool JsonWebKey::parseJsonWebKeySet(const String8& jsonWebKeySet,
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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion media/libaudiohal/impl/CoreConversionHelperHidl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void CoreConversionHelperHidl::parametersToHal(
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)
Expand Down
12 changes: 6 additions & 6 deletions media/libmediaplayerservice/StagefrightRecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ static void TrimString(String8 *s) {
--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) {
Expand Down Expand Up @@ -825,7 +825,7 @@ status_t StagefrightRecorder::setParamGeoDataLatitude(
status_t StagefrightRecorder::setParamRtpLocalIp(const String8 &localIp) {
ALOGV("setParamVideoLocalIp: %s", localIp.c_str());

mLocalIp.setTo(localIp.c_str());
mLocalIp = localIp.c_str();
return OK;
}

Expand All @@ -839,7 +839,7 @@ status_t StagefrightRecorder::setParamRtpLocalPort(int32_t localPort) {
status_t StagefrightRecorder::setParamRtpRemoteIp(const String8 &remoteIp) {
ALOGV("setParamVideoRemoteIp: %s", remoteIp.c_str());

mRemoteIp.setTo(remoteIp.c_str());
mRemoteIp = remoteIp.c_str();
return OK;
}

Expand Down Expand Up @@ -932,7 +932,7 @@ status_t StagefrightRecorder::setLogSessionId(const String8 &log_session_id) {
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;
}

Expand Down Expand Up @@ -1137,9 +1137,9 @@ status_t StagefrightRecorder::setParameters(const String8 &params) {
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;
Expand Down
6 changes: 3 additions & 3 deletions media/libmediaplayerservice/nuplayer/RTPSource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,9 +751,9 @@ status_t NuPlayer::RTPSource::setParameters(const String8 &params) {
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;
Expand Down Expand Up @@ -796,7 +796,7 @@ void NuPlayer::RTPSource::TrimString(String8 *s) {
--i;
}

s->setTo(String8(&data[leading_space], i - leading_space));
*s = String8(&data[leading_space], i - leading_space);
}

} // namespace android
2 changes: 1 addition & 1 deletion media/module/extractors/mp4/ItemTable.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ bool InfeBox::parseNullTerminatedString(
}
buf.push_back(tmp);
if (tmp == 0) {
out->setTo(buf.array());
*out = buf.array();

*offset = newOffset;
*size = stopOffset - newOffset;
Expand Down
8 changes: 4 additions & 4 deletions media/module/extractors/mp4/MPEG4Extractor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ static bool convertTimeToDate(int64_t time_1904, String8 *s) {
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;
Expand Down Expand Up @@ -4082,10 +4082,10 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) {
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) {
Expand All @@ -4094,7 +4094,7 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) {
ALOGE("b/24346430");
return ERROR_MALFORMED;
}
mLastCommentData.setTo((const char *)buffer + 8);
mLastCommentData = ((const char *)buffer + 8);
break;
}

Expand Down
48 changes: 24 additions & 24 deletions media/module/id3/ID3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,40 +535,40 @@ void ID3::Iterator::next() {
}

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.");
Expand All @@ -590,7 +590,7 @@ void ID3::Iterator::getString(String8 *id, String8 *comment) const {
// 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) {
Expand All @@ -605,13 +605,13 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const {
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;
}

Expand Down Expand Up @@ -640,10 +640,10 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const {

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...
Expand All @@ -662,7 +662,7 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const {
framedata = framedatacopy;
}
#endif
id->setTo(framedata, len);
*id = String8(framedata, len);
if (framedatacopy != NULL) {
delete[] framedatacopy;
}
Expand Down Expand Up @@ -715,13 +715,13 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const {
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) {
Expand Down Expand Up @@ -948,7 +948,7 @@ static size_t StringSize(const uint8_t *start, size_t limit, uint8_t encoding) {
const void *
ID3::getAlbumArt(size_t *length, String8 *mime) const {
*length = 0;
mime->setTo("");
*mime = "";

Iterator it(
*this,
Expand All @@ -971,7 +971,7 @@ ID3::getAlbumArt(size_t *length, String8 *mime) const {
ALOGW("bogus album art size: mime");
return NULL;
}
mime->setTo((const char *)&data[consumed]);
*mime = (const char *)&data[consumed];
consumed += mimeLen;

#if 0
Expand Down Expand Up @@ -1008,11 +1008,11 @@ ID3::getAlbumArt(size_t *length, String8 *mime) const {
}

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;
}
Expand Down

0 comments on commit 604c767

Please sign in to comment.