commit 3677ce916cf28c4bc433c5b3c349fc0f25beb31d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 09 17:58:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 09 17:58:45 2023 +0000
tree f955bb0c103be3991f9e537f6b2f8ce70cc195fb
parent 1fbc05b511a2cb4728862fac70e345e76ec10f73
parent b6ee72a7deddbac61bfda64a59909aabc7ebf9ab

Merge "CCodecBufferChannel: rendering depth to default to 3" into udc-dev

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 881c74e..d72d228 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -150,11 +150,10 @@
       mFirstValidFrameIndex(0u),
       mIsSurfaceToDisplay(false),
       mHasPresentFenceTimes(false),
-      mRenderingDepth(0u),
+      mRenderingDepth(3u),
       mMetaMode(MODE_NONE),
       mInputMetEos(false),
       mSendEncryptedInfoBuffer(false) {
-    mOutputSurface.lock()->maxDequeueBuffers = kSmoothnessFactor;
     {
         Mutexed<Input>::Locked input(mInput);
         input->buffers.reset(new DummyInputBuffers(""));
@@ -176,8 +175,9 @@
         pools->outputPoolId = C2BlockPool::BASIC_LINEAR;
     }
     std::string value = server_configurable_flags::GetServerConfigurableFlag(
-            "media_native", "ccodec_rendering_depth", "0");
+            "media_native", "ccodec_rendering_depth", "3");
     android::base::ParseInt(value, &mRenderingDepth);
+    mOutputSurface.lock()->maxDequeueBuffers = kSmoothnessFactor + mRenderingDepth;
 }
 
 CCodecBufferChannel::~CCodecBufferChannel() {