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

Commit f8b72fc9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "webm: skip CSD for video" into main am: f101f573 am: 523117fc 

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



Change-Id: Ie0483974dadde48cfb31b87d2db98fad1c446ca8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff1e5ee6 523117fc

media/libstagefright/MediaMuxer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ status_t MediaMuxer::writeSampleData(const sp<ABuffer> &buffer, size_t trackInde 
        sampleMetaData.setInt32(kKeyIsMuxerData, 1);

    }



    if (flags & MediaCodec::BUFFER_FLAG_CODECCONFIG) {

        sampleMetaData.setInt32(kKeyIsCodecConfig, true);

        ALOGV("BUFFER_FLAG_CODEC_CONFIG");

    }



    if (flags & MediaCodec::BUFFER_FLAG_EOS) {

        sampleMetaData.setInt32(kKeyIsEndOfStream, 1);

        ALOGV("BUFFER_FLAG_EOS");

media/libstagefright/webm/WebmFrameThread.cpp

+11 −0
Original line number Diff line number Diff line
@@ -354,6 +354,17 @@ void WebmFrameMediaSourceThread::run() { 
        }



        MetaDataBase &md = buffer->meta_data();



        if (mType == kVideoType) {

            int32_t isCodecConfig = 0;

            if (md.findInt32(kKeyIsCodecConfig, &isCodecConfig) && isCodecConfig) {

                ALOGI("ignoring CSD for video track");

                buffer->release();

                buffer = NULL;

                continue;

            }

        }



        CHECK(md.findInt64(kKeyTime, &timestampUs));

        if (mStartTimeUs == kUninitialized) {

            mStartTimeUs = timestampUs;