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

Commit fc76db86 authored by Shalaj Jain's avatar Shalaj Jain Committed by Steve Kondik
Browse files

MPEG4Writer: Update esds atom in mpeg4 header with actual bitrate 

- Calculated the average bitrate and replaced the original hardcoded value
  in esds atom with this
- Stored the max bitrate into mMeta with the key kKeyBitRate
- Replaced the original max bitrate in the esds atom with the one from the
  key kKeyBitRate

CRs-Fixed: 304561
(cherry picked from commit 55800415e9192d9a761109d543e343206141b0d3)

Change-Id: Id3973cce02be764e2f7a01ceb018037e7745125a
parent 68396e74

media/libstagefright/MPEG4Writer.cpp

+12 −3
Original line number Diff line number Diff line
@@ -1338,6 +1338,9 @@ status_t MPEG4Writer::Track::start(MetaData *params) { 


    sp<MetaData> meta = new MetaData;

    meta->setInt64(kKeyTime, startTimeUs);

    int32_t bitRate = 0;

    params->findInt32(kKeyBitRate, &bitRate);

    mMeta->setInt32(kKeyBitRate, bitRate);

    status_t err = mSource->start(meta.get());

    if (err != OK) {

        mDone = mReachedEOS = true;
@@ -2625,12 +2628,18 @@ void MPEG4Writer::Track::writeTrackHeader( 
                        mOwner->writeInt8(0x20);  // objectTypeIndication ISO/IEC 14492-2

                        mOwner->writeInt8(0x11);  // streamType VisualStream



                        CHECK(tkhdDuration > 0);

                        int32_t avgBitRate = ((float(mEstimatedTrackSizeBytes) / float(tkhdDuration)) * 8 * 1000);

                        int32_t maxBitRate = 0;

                        mMeta->findInt32(kKeyBitRate, &maxBitRate);



                        static const uint8_t kData[] = {

                            0x01, 0x77, 0x00,

                            0x00, 0x03, 0xe8, 0x00,

                            0x00, 0x03, 0xe8, 0x00

                            0x01, 0x77, 0x00

                        };



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

                        mOwner->writeInt32(maxBitRate);

                        mOwner->writeInt32(avgBitRate);



                        mOwner->writeInt8(0x05);  // DecoderSpecificInfoTag