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

Commit ad764cd0 authored by Shuhei,Miyazaki's avatar Shuhei,Miyazaki Committed by android-build-merger
Browse files

Merge "Set bit rate infomation to meta for MPEG4Extractor" am: 4b4727f0 am:... 

Merge "Set bit rate infomation to meta for MPEG4Extractor" am: 4b4727f0 am: 0267f8c8 am: 498f828e
am: f79de9a2

Change-Id: I520c4c3ac7107d406d57caf1dd76acf3d59d565f
parents d0ca2f28 f79de9a2

media/libstagefright/MPEG4Extractor.cpp

+12 −0
Original line number Diff line number Diff line
@@ -3543,6 +3543,18 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( 
        return ERROR_UNSUPPORTED;

    }



    if (mLastTrack != NULL) {

        uint32_t maxBitrate = 0;

        uint32_t avgBitrate = 0;

        esds.getBitRate(&maxBitrate, &avgBitrate);

        if (maxBitrate > 0 && maxBitrate < INT32_MAX) {

            mLastTrack->meta->setInt32(kKeyMaxBitRate, (int32_t)maxBitrate);

        }

        if (avgBitrate > 0 && avgBitrate < INT32_MAX) {

            mLastTrack->meta->setInt32(kKeyBitRate, (int32_t)avgBitrate);

        }

    }



    const uint8_t *csd;

    size_t csd_size;

    if (esds.getCodecSpecificInfo(