commit 7e819e69272b9a4bb903460c6cb23dc3ab4b5ca3
author bohu <bohu@google.com> Thu Jan 30 11:15:53 2020 -0800
committer Bo Hu <bohu@google.com> Thu Jan 30 19:19:43 2020 +0000
tree 067ed7ac3ed1255f3e32b624474ddeb8bf708b0d
parent a322714496da28d6d42f7ad1ba8c7176649db8d5

goldfish-codecs: prevent context leak and fix portChange

in destroyContext, use correct memory offset so that
host side can actually find the context to destroy.

when output format changed, need to return immediately
to avoid overrun on output buffer.

BUG: 124388359

Test: atest android.media.cts.AdaptivePlaybackTest#testH264_adaptiveSmallDrc
Change-Id: Idabb2dcf383de48c3442ebdb84e1b4c5bfeb8868

system/codecs/omx/avcdec/GoldfishAVCDec.cpp

diff --git a/system/codecs/omx/avcdec/GoldfishAVCDec.cpp b/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
index 1da4cf0..28c5d5c 100644
--- a/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
+++ b/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
@@ -365,6 +365,9 @@
                     resetPlugin();
                     mWidth = myWidth;
                     mHeight = myHeight;
+                    if (portWillReset) {
+                        return;
+                    }
                 }
                 outHeader->nFilledLen =  (outputBufferWidth() * outputBufferHeight() * 3) / 2;
                 int myStride = outputBufferWidth();

system/codecs/omx/avcdec/MediaH264Decoder.cpp

diff --git a/system/codecs/omx/avcdec/MediaH264Decoder.cpp b/system/codecs/omx/avcdec/MediaH264Decoder.cpp
index 4c6d349..05111cc 100644
--- a/system/codecs/omx/avcdec/MediaH264Decoder.cpp
+++ b/system/codecs/omx/avcdec/MediaH264Decoder.cpp
@@ -77,7 +77,7 @@
     auto transport = GoldfishMediaTransport::getInstance();
     transport->writeParam((uint64_t)mHostHandle, 0, mAddressOffSet);
     transport->sendOperation(MediaCodecType::H264Codec,
-                             MediaOperation::DestroyContext);
+                             MediaOperation::DestroyContext, mAddressOffSet);
     transport->returnMemorySlot(mAddressOffSet >> 23);
     mHasAddressSpaceMemory = false;
 }