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

Commit 49df5321 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 am: b7db9df9 

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



Change-Id: Ic37bd9de2b400d87d2d98316dfc29df64138e98e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 946a39f9 b7db9df9

media/module/extractors/mp3/MP3Extractor.cpp

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

            String8 commentvalue;

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

            const char * desc = commentdesc.string();

            const char * value = commentvalue.string();

            const char * desc = commentdesc.c_str();

            const char * value = commentvalue.c_str();



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

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

        delete it;



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

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

    }



    size_t dataSize;

media/module/extractors/mp4/MPEG4Extractor.cpp

+3 −3
Original line number 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,

                        chunk_data_size - 8 - encoding_length - 1);

                AMediaFormat_setString(mLastTrack->meta,

                        AMEDIAFORMAT_KEY_MIME, mimeFormat.string());

                        AMEDIAFORMAT_KEY_MIME, mimeFormat.c_str());

            }

            break;

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


            String8 s;

            if (convertTimeToDate(creationTime, &s)) {

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

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

            }



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

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

            String8 tmpUTF8str(framedata, len16);

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

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

        }

    }