commit 8f922e189dbb1d7e75a4f4d2a51fe32a905549de
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 20 01:19:51 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 20 01:19:51 2019 +0000
tree 95c00e8d77fb02c698795e65137464307d825cac
parent c24f9ea08daf97724ab0b463ed0367b95d323a56
parent 524b05802d10cf14a187f810da6d547d9dfabe14

Merge "CCodec: don't update pipeline watcher if using input surface"

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index fb6af93..9c30818 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -2593,9 +2593,9 @@
         return false;
     }
 
-    if (work->worklets.size() != 1u
+    if (mInputSurface == nullptr && (work->worklets.size() != 1u
             || !work->worklets.front()
-            || !(work->worklets.front()->output.flags & C2FrameData::FLAG_INCOMPLETE)) {
+            || !(work->worklets.front()->output.flags & C2FrameData::FLAG_INCOMPLETE))) {
         mPipelineWatcher.lock()->onWorkDone(work->input.ordinal.frameIndex.peeku());
     }