Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd8da9c4 authored by Atanas Kirilov's avatar Atanas Kirilov Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a3 am: d04d54f8
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a3
  MediaExtractor: stop rendering when an error occurs
parents 1ff39c65 73bc1230

media/libstagefright/MidiExtractor.cpp

+3 −2
Original line number Diff line number Diff line
@@ -246,8 +246,9 @@ MediaBuffer* MidiEngine::readBuffer() { 
        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);