summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-12-12 14:04:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-12 14:04:22 -0800
commit4fa89b9b52e3329bb846ef314fb0ac65c0c1e04f (patch)
tree8cbad6777a99820e4abf901febd83a43900d025a /media
parent84b6440fa1d1274267deabe0bd8dc626b5548e4c (diff)
parent308ca621005ab86847b1b1dabaf65a2521844a2a (diff)
downloadframeworks_av-4fa89b9b52e3329bb846ef314fb0ac65c0c1e04f.zip
frameworks_av-4fa89b9b52e3329bb846ef314fb0ac65c0c1e04f.tar.gz
frameworks_av-4fa89b9b52e3329bb846ef314fb0ac65c0c1e04f.tar.bz2
Merge "Increase buffer size for video"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/FragmentedMP4Extractor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/FragmentedMP4Extractor.cpp b/media/libstagefright/FragmentedMP4Extractor.cpp
index 82712ef..10655b9 100644
--- a/media/libstagefright/FragmentedMP4Extractor.cpp
+++ b/media/libstagefright/FragmentedMP4Extractor.cpp
@@ -222,8 +222,8 @@ status_t FragmentedMPEG4Source::start(MetaData *params) {
mGroup = new MediaBufferGroup;
- int32_t max_size = 65536;
- // XXX CHECK(mFormat->findInt32(kKeyMaxInputSize, &max_size));
+ // for video, make the buffer big enough for an extremely poorly compressed 1080p frame.
+ int32_t max_size = mIsAudioTrack ? 65536 : 3110400;
mGroup->add_buffer(new MediaBuffer(max_size));