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

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

Merge "codec2: Avoid sending input done event for incomplete work" am:... 

Merge "codec2: Avoid sending input done event for incomplete work" am: bffaa476 am: 88a9462b am: 88c8899e am: 12f3c1e2

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

Change-Id: I89a3d825aeec28de03000f1c65c47b550b42a9f8
parents 35d5729c 12f3c1e2

media/codec2/sfplugin/CCodec.cpp

+6 −1
Original line number Diff line number Diff line
@@ -2285,8 +2285,13 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
                    }

                }

                if (config->mInputSurface) {

                    if (work->worklets.empty()

                           || !work->worklets.back()

                           || (work->worklets.back()->output.flags

                                  & C2FrameData::FLAG_INCOMPLETE) == 0) {

                        config->mInputSurface->onInputBufferDone(work->input.ordinal.frameIndex);

                    }

                }

                if (initDataWatcher.hasChanged()) {

                    initData = initDataWatcher.update();

                    AmendOutputFormatWithCodecSpecificData(