commit 73bc1230e7b4d49ec5fc1765d1768dd1ab0ca7a6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jul 10 20:13:46 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jul 10 20:13:46 2018 +0000
tree b706ba66818ba61f1065d2750a8fcb8aab7e46d4
parent 3d634e64725dd3d2c98baa8b045d1e764f2305e9
parent d04d54f843c5aa314cb0cae5ac5009bd256cecb9

[automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 am: d04d54f843

Change-Id: If7842c0575c4283518e15230d5550356dffe5021

media/libstagefright/MidiExtractor.cpp

diff --git a/media/libstagefright/MidiExtractor.cpp b/media/libstagefright/MidiExtractor.cpp
index 7930bbb..2145134 100644
--- a/media/libstagefright/MidiExtractor.cpp
+++ b/media/libstagefright/MidiExtractor.cpp
@@ -246,8 +246,9 @@
         EAS_I32 numRendered;
         EAS_RESULT result = EAS_Render(mEasData, p, mEasConfig->mixBufferSize, &numRendered);
         if (result != EAS_SUCCESS) {
-            ALOGE("EAS_Render returned %ld", result);
-            break;
+            ALOGE("EAS_Render() returned %ld, numBytesOutput = %d", result, numBytesOutput);
+            buffer->release();
+            return NULL; // Stop processing to prevent infinite loops.
         }
         p += numRendered * mEasConfig->numChannels;
         numBytesOutput += numRendered * mEasConfig->numChannels * sizeof(EAS_PCM);