summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2011-12-07 14:11:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-07 14:11:14 -0800
commiteebeceec684a36222b4559e3157b0db04c0a67ed (patch)
tree30db66d7414a91c0f1d123ec263e2b1de73a77f3 /media
parent43afd557f8b4b87561321135cf284b14e87c2bc6 (diff)
parent59a6c2874abdee0123aba4d251d0c81df393efb8 (diff)
downloadframeworks_av-eebeceec684a36222b4559e3157b0db04c0a67ed.zip
frameworks_av-eebeceec684a36222b4559e3157b0db04c0a67ed.tar.gz
frameworks_av-eebeceec684a36222b4559e3157b0db04c0a67ed.tar.bz2
am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '6727a43f6d8ff193b86ca90b2daa761c47157638': Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 759d05a..964cb1f 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -2021,9 +2021,9 @@ status_t AwesomePlayer::finishSetDataSource_l() {
mLock.unlock();
- // Initially make sure we have at least 128 bytes for the sniff
+ // Initially make sure we have at least 192 KB for the sniff
// to complete without blocking.
- static const size_t kMinBytesForSniffing = 128;
+ static const size_t kMinBytesForSniffing = 192 * 1024;
off64_t metaDataSize = -1ll;
for (;;) {