summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRachad <rachad@google.com>2014-10-07 17:55:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 17:55:18 +0000
commit703424dad7b1ffb7e55fb4780f609e3d3e514f5a (patch)
tree75797e994927a99739774f6e3c7b6381ced6a654 /include
parent5a46e4e1fd70e713c6cf48f3a2e5dcdaf54f2d86 (diff)
parent9d06b8026d551c24527d6f72f134046d94068c46 (diff)
downloadframeworks_av-703424dad7b1ffb7e55fb4780f609e3d3e514f5a.zip
frameworks_av-703424dad7b1ffb7e55fb4780f609e3d3e514f5a.tar.gz
frameworks_av-703424dad7b1ffb7e55fb4780f609e3d3e514f5a.tar.bz2
am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev
* commit '9d06b8026d551c24527d6f72f134046d94068c46': stagefright: do not allocate output buffers for tunneled playback
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 28e5c56..d77ddaf 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -217,6 +217,8 @@ private:
bool mCreateInputBuffersSuspended;
+ bool mTunneled;
+
status_t setCyclicIntraMacroblockRefresh(const sp<AMessage> &msg, int32_t mode);
status_t allocateBuffersOnPort(OMX_U32 portIndex);
status_t freeBuffersOnPort(OMX_U32 portIndex);