commit e697eccd28eeabc114ef39e36ca0db04d2de2bfa
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 01 00:04:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 01 00:04:32 2020 +0000
tree 7d0813fd3018d3e0b551fab2fdb543a119c53aab
parent 2c82c1bd4af437bafb1ae608daa1e938b6deaa28
parent 5f86fde1a701ebbd6891ad1f27b1941750cf2a67

Merge "CCodec: GraphicBufferSourceWrapper: fix to apply nBufferCountActual for deciding number of inputs" am: 59e92fdb26 am: e328ab7204 am: 5f86fde1a7

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

Change-Id: I621408517977a8ae01dff3246f0860eebc7e2b7c

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index f816778..9c1df71 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -246,8 +246,19 @@
         if (source == nullptr) {
             return NO_INIT;
         }
-        constexpr size_t kNumSlots = 16;
-        for (size_t i = 0; i < kNumSlots; ++i) {
+
+        size_t numSlots = 4;
+        constexpr OMX_U32 kPortIndexInput = 0;
+
+        OMX_PARAM_PORTDEFINITIONTYPE param;
+        param.nPortIndex = kPortIndexInput;
+        status_t err = mNode->getParameter(OMX_IndexParamPortDefinition,
+                                           &param, sizeof(param));
+        if (err == OK) {
+            numSlots = param.nBufferCountActual;
+        }
+
+        for (size_t i = 0; i < numSlots; ++i) {
             source->onInputBufferAdded(i);
         }