summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2011-12-07 14:05:41 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-07 14:05:41 -0800
commit2c170cd8e308712674edd2cc7eebea70359d4951 (patch)
treec0f8622f3613dfbeb0975a0792cb46093e0918b8 /media
parent0c4ec128aa324f99f726a314bd97e8a581f22ec5 (diff)
parentbab412099ab1bd3e9e942453cbb42c87ea9a59ec (diff)
downloadframeworks_av-2c170cd8e308712674edd2cc7eebea70359d4951.zip
frameworks_av-2c170cd8e308712674edd2cc7eebea70359d4951.tar.gz
frameworks_av-2c170cd8e308712674edd2cc7eebea70359d4951.tar.bz2
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
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 18dd8ef..50c264e 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 (;;) {