commit 41fb9985ba433ded92e8b50579338c78b33e5cc7
author Haripriya Deshmukh <haripriya.deshmukh@ittiam.com> Tue Sep 19 21:59:24 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Sep 19 21:59:24 2023 +0000
tree ecbe4cfa890f5553a4eb3d00d6ae3c5b2a5f0442
parent 7e224c8dd2a2f794dca1cf9befe2d8ec37b8317c

Add check for valueFor api to address key not found issue

Bug: 276446137
Test: POC in bug descriptions
(cherry picked from https://partner-android-review.googlesource.com/q/commit:d1bd2e40786986c8b2504e5cb0978e9469d1ff83)
Merged-In: I97cdba5c96a2c4af29a21ba08a5aa0198ef37d14
Change-Id: I97cdba5c96a2c4af29a21ba08a5aa0198ef37d14

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
index a4b3e2f..e091cb8 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
@@ -286,9 +286,11 @@
             return;
         }
 
-        // decoder deals in ms, OMX in us.
-        outHeader->nTimeStamp = mPvToOmxTimeMap.valueFor(timestamp);
-        mPvToOmxTimeMap.removeItem(timestamp);
+        if (mPvToOmxTimeMap.indexOfKey(timestamp) >= 0) {
+            // decoder deals in ms, OMX in us.
+            outHeader->nTimeStamp = mPvToOmxTimeMap.valueFor(timestamp);
+            mPvToOmxTimeMap.removeItem(timestamp);
+        }
 
         inHeader->nOffset += bufferSize;
         inHeader->nFilledLen = 0;