Merge "stagefright: Clear RenderQueue on port settings changed" am: 1a3181d359

am: 8b3cc2b046

Change-Id: Ia4b8ca2d59824d9d78b86b29861ce2ffc1b515c2

media/libstagefright/ACodec.cpp

@@ -7922,6 +7922,10 @@ bool ACodec::OutputPortSettingsChangedState::onOMXEvent(
                             OMX_CommandPortEnable, kPortIndexOutput);
                 }
 
+                // Clear the RenderQueue in which queued GraphicBuffers hold the
+                // actual buffer references in order to free them early.
+                mCodec->mRenderTracker.clear(systemTime(CLOCK_MONOTONIC));
+
                 if (err == OK) {
                     err = mCodec->allocateBuffersOnPort(kPortIndexOutput);
                     ALOGE_IF(err != OK, "Failed to allocate output port buffers after port "