summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-09-13 09:26:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-13 09:26:19 -0700
commitd168b19bc716bf04a35c380af250e1974d0aecd2 (patch)
tree66cc8966d36d576d20592153e0cd6386e7356dce /media
parent00f41327264fa2e59cc05abaa5c554b2a32938e1 (diff)
parent5a832f87b680ead3606c4448a0a82c0e556d1b93 (diff)
downloadframeworks_av-d168b19bc716bf04a35c380af250e1974d0aecd2.zip
frameworks_av-d168b19bc716bf04a35c380af250e1974d0aecd2.tar.gz
frameworks_av-d168b19bc716bf04a35c380af250e1974d0aecd2.tar.bz2
Merge "Use proper number of video buffers to be acquired simultaneously from" into jb-mr1-dev
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/wifi-display/source/PlaybackSession.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
index 5d0ddf1..a6bb8c6 100644
--- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp
+++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
@@ -785,8 +785,7 @@ status_t WifiDisplaySource::PlaybackSession::addVideoSource() {
}
// Add one reference to account for the serializer.
- // Add another two for unknown reasons.
- err = source->setMaxAcquiredBufferCount(15); // XXX numInputBuffers + 2);
+ err = source->setMaxAcquiredBufferCount(numInputBuffers);
CHECK_EQ(err, (status_t)OK);
mBufferQueue = source->getBufferQueue();