commit 87de3e7603fb90da607cf95b245b37fcd0e7501c
author Wonsik Kim <wonsik@google.com> Mon Jul 01 16:23:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 16:23:35 2019 -0700
tree 275143b1e1659771548dadd25e4cf5310699866d
parent e13261d3b25dadb4c60f05f3f48bedcb36e149e8
parent e80279e64ef4a6591f664f27e4bfc931ddb2ad20

Merge "codec2: initialize delays at start" into qt-dev
am: e80279e64e

Change-Id: I584168f28138576b783e50aa1351e9c9b20c9888

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 9778498..09049b9 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -886,6 +886,8 @@
 
         bool forceArrayMode = false;
         Mutexed<Input>::Locked input(mInput);
+        input->inputDelay = inputDelayValue;
+        input->pipelineDelay = pipelineDelayValue;
         input->numSlots = numInputSlots;
         input->extraBuffers.flush();
         input->numExtraSlots = 0u;
@@ -1052,6 +1054,7 @@
         }
 
         Mutexed<Output>::Locked output(mOutput);
+        output->outputDelay = outputDelayValue;
         output->numSlots = numOutputSlots;
         if (graphic) {
             if (outputSurface) {