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

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

Merge "C2SoftMpeg4Enc: Do not return 0 byte CSD for H263" am: 386643fc am:... 

Merge "C2SoftMpeg4Enc: Do not return 0 byte CSD for H263" am: 386643fc am: ca5dfc3c am: 4f587a02 am: 31ec0f5c am: 1c4cdc4c

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

Change-Id: If2ee3b97f1d612fe6290ca4c6a6c0f2cef224233
parents 81dd0f58 1c4cdc4c

media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp

+11 −9
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ void C2SoftMpeg4Enc::process( 
        }



        ++mNumInputFrames;

        if (outputSize) {

            std::unique_ptr<C2StreamInitDataInfo::output> csd =

                C2StreamInitDataInfo::output::AllocUnique(outputSize, 0u);

            if (!csd) {
@@ -447,6 +448,7 @@ void C2SoftMpeg4Enc::process( 
            memcpy(csd->m.value, outPtr, outputSize);

            work->worklets.front()->output.configUpdate.push_back(std::move(csd));

        }

    }



    // handle dynamic bitrate change

    {