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

Commit fe7a6971 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['android-review.googlesource.com/3276973'] into 24Q4-release.

Change-Id: Ic280a211a96e1bbb37994941dc4e6f0543f4cbda
parents 15a824f2 a6575ab3
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -2628,8 +2628,6 @@ void CCodecBufferChannel::sendOutputBuffers() {
        switch (action) {
        case OutputBuffers::SKIP:
            return;
        case OutputBuffers::DISCARD:
            break;
        case OutputBuffers::NOTIFY_CLIENT:
        {
            // TRICKY: we want popped buffers reported in order, so sending
@@ -2656,13 +2654,16 @@ void CCodecBufferChannel::sendOutputBuffers() {
                    outBuffer->meta()->setObject("accessUnitInfo", obj);
                }
            }
            mCallback->onOutputBufferAvailable(index, outBuffer);
            [[fallthrough]];
        }
        case OutputBuffers::DISCARD: {
            if (mHasInputSurface && android::media::codec::provider_->input_surface_throttle()) {
                Mutexed<InputSurface>::Locked inputSurface(mInputSurface);
                --inputSurface->numProcessingBuffersBalance;
                ALOGV("[%s] onOutputBufferAvailable: numProcessingBuffersBalance = %lld",
                ALOGV("[%s] onWorkDone: numProcessingBuffersBalance = %lld",
                        mName, static_cast<long long>(inputSurface->numProcessingBuffersBalance));
            }
            mCallback->onOutputBufferAvailable(index, outBuffer);
            break;
        }
        case OutputBuffers::REALLOCATE: