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

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

Merge "CCodecBufferChannel: remove assumption that pipeline clears quickly on...

Merge "CCodecBufferChannel: remove assumption that pipeline clears quickly on input EOS" am: d012efd3 am: a51113a7

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



Change-Id: I44085a55529badd883ab8da1197e06833fd490e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 738b62f9 a51113a7
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -2098,12 +2098,13 @@ status_t CCodecBufferChannel::setSurface(const sp<Surface> &newSurface) {
}

PipelineWatcher::Clock::duration CCodecBufferChannel::elapsed() {
    // When client pushed EOS, we want all the work to be done quickly.
    // Otherwise, component may have stalled work due to input starvation up to
    // the sum of the delay in the pipeline.
    // TODO(b/231253301): When client pushed EOS, the pipeline could have less
    //                    number of frames.
    size_t n = 0;
    if (!mInputMetEos) {
    size_t outputDelay = mOutput.lock()->outputDelay;
    {
        Mutexed<Input>::Locked input(mInput);
        n = input->inputDelay + input->pipelineDelay + outputDelay;
    }