commit 2a7aaff53c96434c694c0bb6c402c4cda90ebc6b
author Wonsik Kim <wonsik@google.com> Fri Apr 12 17:54:59 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 12 17:54:59 2024 +0000
tree cf27743a243c4eb06f42d6498e2804083354fc4e
parent 19af5994cc38f0cae631860320b7461e37829009
parent 8056af66bf41bd54ddb4348e9acd5d216dd2f391

Merge "Fix seek error in loop mode." into main am: 74656dddde am: 8056af66bf

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

Change-Id: Ica952830af6ada7eb202a29c9ec5320db69af00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp

diff --git a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp
index 2137964..fd9488b 100644
--- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp
+++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp
@@ -469,11 +469,12 @@
         mInitialized = false;
     }
 
+    bool codecConfig = (work->input.flags & C2FrameData::FLAG_CODEC_CONFIG) != 0;
+
     if (!mInitialized) {
         uint8_t *vol_data[1]{};
         int32_t vol_size = 0;
 
-        bool codecConfig = (work->input.flags & C2FrameData::FLAG_CODEC_CONFIG) != 0;
         if (codecConfig || volHeader) {
             vol_data[0] = bitstream;
             vol_size = inSize;
@@ -512,10 +513,11 @@
                 return;
             }
         }
-        if (codecConfig) {
-            fillEmptyWork(work);
-            return;
-        }
+    }
+
+    if (codecConfig) {
+        fillEmptyWork(work);
+        return;
     }
 
     size_t inPos = 0;