commit fd8da9c45dd1a08497272f94dbad141903aad81c
author Atanas Kirilov <akirilov@google.com> Wed Jul 11 22:45:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 11 22:45:05 2018 +0000
tree e6a4d977a7ae5e26c5df9ef83f91f5146a52a35f
parent 1ff39c654ab9d594a807f6327e1a28c67517173d
parent 73bc1230e7b4d49ec5fc1765d1768dd1ab0ca7a6

Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into nyc-mr1-dev

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

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);