commit 2715aa16d6c43737cb490738bba7b451d89c82f6
author Andy Hung <hunga@google.com> Fri Oct 07 19:55:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 07 19:55:01 2016 +0000
tree bfb203f7df724ffb0f530921f08382be50c43230
parent 4e1fe188f263d7774330a0bcb1f6744790198aea
parent 811bc424407084dbad79eecec07f2b51bc9fa55a

MediaCodecSource: Fix buffer allocation am: 01d1e52558 am: 578f4e60cd
am: 811bc42440

Change-Id: I28ff5f5f8f75d47974c4fbe7849c4e1750e7fd9e

media/libstagefright/MediaCodecSource.cpp

diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp
index 137a924..8391d76 100644
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@@ -860,6 +860,7 @@
             }
 
             MediaBuffer *mbuf = new MediaBuffer(outbuf->size());
+            mbuf->setObserver(this);
             mbuf->add_ref();
 
             if (!(flags & MediaCodec::BUFFER_FLAG_CODECCONFIG)) {
@@ -913,7 +914,6 @@
                 mbuf->meta_data()->setInt32(kKeyIsSyncFrame, true);
             }
             memcpy(mbuf->data(), outbuf->data(), outbuf->size());
-            mbuf->setObserver(this);
 
             {
                 Mutexed<Output>::Locked output(mOutput);