commit b37379401f30b088a1ac01a2858890e461070d14
author Jaideep Sharma <quic_jaidshar@quicinc.com> Wed Jun 24 16:55:04 2020 +0530
committer Ray Essick <essick@google.com> Tue Jul 07 21:08:29 2020 -0700
tree 4eff2f3e156e583b9c3361afd55d037986ccfa02
parent 9ce151cc23792a799ca2e0ce66988b9f6e5b76e8

mp3dec: handle EOS with first frame

handle EOS with first frame.

Bug: 156203931
Test: android.mediav2.cts.CodecDecoderTest#testOnlyEos[audio/mpeg]

Change-Id: I3efdea14409cf4a17aa4512c70d5c0e5992a3ab6

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
index 80083f7..b5d32ed 100644
--- a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
+++ b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
@@ -307,6 +307,20 @@
 
             if (inHeader->nFlags & OMX_BUFFERFLAG_EOS) {
                 mSawInputEos = true;
+                if (mIsFirst && !inHeader->nFilledLen) {
+                     ALOGV("empty first EOS");
+                     outHeader->nFilledLen = 0;
+                     outHeader->nTimeStamp = inHeader->nTimeStamp;
+                     outHeader->nFlags = OMX_BUFFERFLAG_EOS;
+                     mSignalledOutputEos = true;
+                     outInfo->mOwnedByUs = false;
+                     outQueue.erase(outQueue.begin());
+                     notifyFillBufferDone(outHeader);
+                     inInfo->mOwnedByUs = false;
+                     inQueue.erase(inQueue.begin());
+                     notifyEmptyBufferDone(inHeader);
+                     return;
+                }
             }
 
             mConfig->pInputBuffer =