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

Commit 24a93b47 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge \"stagefright: do not use default bitrates in MPEG4Writer\" into nyc-dev 

am: eb6dbc64

Change-Id: I6e0815b1327c5f383f7a2189de6ab7227d383f1f
parents 274a412f eb6dbc64

media/libstagefright/ACodec.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1732,6 +1732,14 @@ status_t ACodec::configureCodec( 
        return INVALID_OPERATION;

    }



    // propagate bitrate to the output so that the muxer has it

    if (encoder && msg->findInt32("bitrate", &bitRate)) {

        // Technically ISO spec says that 'bitrate' should be 0 for VBR even though it is the

        // average bitrate. We've been setting both bitrate and max-bitrate to this same value.

        outputFormat->setInt32("bitrate", bitRate);

        outputFormat->setInt32("max-bitrate", bitRate);

    }



    int32_t storeMeta;

    if (encoder

            && msg->findInt32("android._input-metadata-buffer-type", &storeMeta)

media/libstagefright/MPEG4Writer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -3041,9 +3041,9 @@ void MPEG4Writer::Track::writeMp4aEsdsBox() { 
    mOwner->writeInt16(0x03);  // XXX

    mOwner->writeInt8(0x00);   // buffer size 24-bit (0x300)



    int32_t avgBitrate = 256000;

    int32_t avgBitrate = 0;

    (void)mMeta->findInt32(kKeyBitRate, &avgBitrate);

    int32_t maxBitrate = avgBitrate;

    int32_t maxBitrate = 0;

    (void)mMeta->findInt32(kKeyMaxBitRate, &maxBitrate);

    mOwner->writeInt32(maxBitrate);

    mOwner->writeInt32(avgBitrate);
@@ -3084,9 +3084,9 @@ void MPEG4Writer::Track::writeMp4vEsdsBox() { 
    };

    mOwner->write(kData, sizeof(kData));



    int32_t avgBitrate = 256000;

    int32_t avgBitrate = 0;

    (void)mMeta->findInt32(kKeyBitRate, &avgBitrate);

    int32_t maxBitrate = avgBitrate;

    int32_t maxBitrate = 0;

    (void)mMeta->findInt32(kKeyMaxBitRate, &maxBitrate);

    mOwner->writeInt32(maxBitrate);

    mOwner->writeInt32(avgBitrate);