commit c98a29c3e1cd8e0551f6b60de6199a9cc451043f
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Jul 20 17:26:12 2021 -0700
committer Ray Essick <essick@google.com> Mon Aug 23 08:54:28 2021 -0700
tree a23efd0346f9ffcabbd0acb914bad0b82d53f397
parent 1d9c0ec299d03f5d83df8442cfacb308c9cfa538

C2SoftMpeg4Enc: Do not return 0 byte CSD for H263

Bug: 192791004
Test: recordvideo -2
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest
Test: atest CtsMediaV2TestCases

Change-Id: If58a8b7c0e4d6097b9ecf4979ded50c4e628ae54

media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp

diff --git a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
index 3c87531..3bfec66 100644
--- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
+++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
@@ -436,16 +436,18 @@
         }
 
         ++mNumInputFrames;
-        std::unique_ptr<C2StreamInitDataInfo::output> csd =
-            C2StreamInitDataInfo::output::AllocUnique(outputSize, 0u);
-        if (!csd) {
-            ALOGE("CSD allocation failed");
-            mSignalledError = true;
-            work->result = C2_NO_MEMORY;
-            return;
+        if (outputSize) {
+            std::unique_ptr<C2StreamInitDataInfo::output> csd =
+                C2StreamInitDataInfo::output::AllocUnique(outputSize, 0u);
+            if (!csd) {
+                ALOGE("CSD allocation failed");
+                mSignalledError = true;
+                work->result = C2_NO_MEMORY;
+                return;
+            }
+            memcpy(csd->m.value, outPtr, outputSize);
+            work->worklets.front()->output.configUpdate.push_back(std::move(csd));
         }
-        memcpy(csd->m.value, outPtr, outputSize);
-        work->worklets.front()->output.configUpdate.push_back(std::move(csd));
     }
 
     // handle dynamic bitrate change