Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7db9df9 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str (mainline modules)" into main am: cf3bb9e4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2705885



Change-Id: I39a964b170a1a3dc78e796836dc822e7e9118cb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbcb210d cf3bb9e4

media/module/extractors/mp3/MP3Extractor.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -379,8 +379,8 @@ MP3Extractor::MP3Extractor( 
            String8 commentdesc;

            String8 commentdesc;

            String8 commentvalue;

            String8 commentvalue;

            com->getString(&commentdesc, &commentvalue);

            com->getString(&commentdesc, &commentvalue);

            const char * desc = commentdesc.string();

            const char * desc = commentdesc.c_str();

            const char * value = commentvalue.string();

            const char * value = commentvalue.c_str();





            // first 3 characters are the language, which we don't care about

            // first 3 characters are the language, which we don't care about

            if(strlen(desc) > 3 && strcmp(desc + 3, "iTunSMPB") == 0) {

            if(strlen(desc) > 3 && strcmp(desc + 3, "iTunSMPB") == 0) {
@@ -652,7 +652,7 @@ media_status_t MP3Extractor::getMetaData(AMediaFormat *meta) { 
        it->getString(&s);

        it->getString(&s);

        delete it;

        delete it;





        AMediaFormat_setString(meta, kMap[i].key, s.string());

        AMediaFormat_setString(meta, kMap[i].key, s.c_str());

    }

    }





    size_t dataSize;

    size_t dataSize;

media/module/extractors/mp4/MPEG4Extractor.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -1794,7 +1794,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                String8 mimeFormat(str + 8 + encoding_length + 1,

                String8 mimeFormat(str + 8 + encoding_length + 1,

                        chunk_data_size - 8 - encoding_length - 1);

                        chunk_data_size - 8 - encoding_length - 1);

                AMediaFormat_setString(mLastTrack->meta,

                AMediaFormat_setString(mLastTrack->meta,

                        AMEDIAFORMAT_KEY_MIME, mimeFormat.string());

                        AMEDIAFORMAT_KEY_MIME, mimeFormat.c_str());

            }

            }

            break;

            break;

        }

        }
@@ -2813,7 +2813,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 




            String8 s;

            String8 s;

            if (convertTimeToDate(creationTime, &s)) {

            if (convertTimeToDate(creationTime, &s)) {

                AMediaFormat_setString(mFileMetaData, AMEDIAFORMAT_KEY_DATE, s.string());

                AMediaFormat_setString(mFileMetaData, AMEDIAFORMAT_KEY_DATE, s.c_str());

            }

            }





            break;

            break;
@@ -4368,7 +4368,7 @@ status_t MPEG4Extractor::parse3GPPMetaData(off64_t offset, size_t size, int dept 
        } else {

        } else {

            // Convert from UTF-16 string to UTF-8 string.

            // Convert from UTF-16 string to UTF-8 string.

            String8 tmpUTF8str(framedata, len16);

            String8 tmpUTF8str(framedata, len16);

            AMediaFormat_setString(mFileMetaData, metadataKey, tmpUTF8str.string());

            AMediaFormat_setString(mFileMetaData, metadataKey, tmpUTF8str.c_str());

        }

        }

    }

    }

media/module/foundation/ALooperRoster.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ void ALooperRoster::dump(int fd, const Vector<String16>& args) { 
        }

        }

        s.append("\n");

        s.append("\n");

    }

    }

    (void)write(fd, s.string(), s.size());

    (void)write(fd, s.c_str(), s.size());

}

}





}  // namespace android
 
}  // namespace android

media/module/foundation/AString.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ AString::AString(const String8 &from) 
    : mData(NULL),

    : mData(NULL),

      mSize(0),

      mSize(0),

      mAllocSize(1) {

      mAllocSize(1) {

    setTo(from.string(), from.length());

    setTo(from.c_str(), from.length());

}

}





AString::AString(const AString &from)

AString::AString(const AString &from)

media/module/foundation/MetaDataBase.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -434,7 +434,7 @@ String8 MetaDataBase::toString() const { 
        char cc[5];

        char cc[5];

        MakeFourCCString(key, cc);

        MakeFourCCString(key, cc);

        const typed_data &item = mInternalData->mItems.valueAt(i);

        const typed_data &item = mInternalData->mItems.valueAt(i);

        s.appendFormat("%s: %s", cc, item.asString(false).string());

        s.appendFormat("%s: %s", cc, item.asString(false).c_str());

        if (i != 0) {

        if (i != 0) {

            s.append(", ");

            s.append(", ");

        }

        }
@@ -448,7 +448,7 @@ void MetaDataBase::dumpToLog() const { 
        char cc[5];

        char cc[5];

        MakeFourCCString(key, cc);

        MakeFourCCString(key, cc);

        const typed_data &item = mInternalData->mItems.valueAt(i);

        const typed_data &item = mInternalData->mItems.valueAt(i);

        ALOGI("%s: %s", cc, item.asString(true /* verbose */).string());

        ALOGI("%s: %s", cc, item.asString(true /* verbose */).c_str());

    }

    }

}

}