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

Commit 61dcc2ce authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix webm writer"

parents 28404e28 688031f8

media/libstagefright/include/media/stagefright/MetaDataBase.h

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ enum { 
    kKeyAV1C              = 'av1c',  // raw data

    kKeyThumbnailHVCC     = 'thvc',  // raw data

    kKeyD263              = 'd263',  // raw data

    kKeyVorbisInfo        = 'vinf',  // raw data

    kKeyVorbisBooks       = 'vboo',  // raw data

    kKeyOpusHeader        = 'ohdr',  // raw data

    kKeyOpusCodecDelay    = 'ocod',  // uint64_t (codec delay in ns)

    kKeyOpusSeekPreRoll   = 'ospr',  // uint64_t (seek preroll in ns)

media/libstagefright/webm/WebmWriter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ sp<WebmElement> WebmWriter::audioTrack(const sp<MetaData>& md) { 
        const void *headerData3;

        size_t headerSize1, headerSize2 = sizeof(headerData2), headerSize3;



        if (!md->findData(kKeyVorbisInfo, &type, &headerData1, &headerSize1)

            || !md->findData(kKeyVorbisBooks, &type, &headerData3, &headerSize3)) {

        if (!md->findData(kKeyOpaqueCSD0, &type, &headerData1, &headerSize1)

            || !md->findData(kKeyOpaqueCSD1, &type, &headerData3, &headerSize3)) {

            ALOGE("Missing header format keys for vorbis track");

            md->dumpToLog();

            return NULL;