diff options
| author | Andreas Huber <andih@google.com> | 2010-03-11 09:14:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-11 09:14:45 -0800 |
| commit | 6fc13ab8d00819b7420d1b0a500896264e820409 (patch) | |
| tree | 0a7a4c2e85386559dcdbed4a4dfddf480dd1407f | |
| parent | 64fb06f698b39759a7a2ebacd0a175949b7506a5 (diff) | |
| parent | 79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8 (diff) | |
| download | frameworks_av-6fc13ab8d00819b7420d1b0a500896264e820409.zip frameworks_av-6fc13ab8d00819b7420d1b0a500896264e820409.tar.gz frameworks_av-6fc13ab8d00819b7420d1b0a500896264e820409.tar.bz2 | |
Merge "Reduce buffer sizes related to HTTP media data transfer in order to reduce the probability of a connection timeout/reset due to long periods of time between socket activity."
| -rw-r--r-- | include/media/stagefright/HTTPDataSource.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/media/stagefright/HTTPDataSource.h b/include/media/stagefright/HTTPDataSource.h index 98ebc48..23522bd 100644 --- a/include/media/stagefright/HTTPDataSource.h +++ b/include/media/stagefright/HTTPDataSource.h @@ -50,7 +50,7 @@ protected: private: enum { - kBufferSize = 64 * 1024 + kBufferSize = 32 * 1024 }; String8 mHeaders; diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 1696eb9..8468a07 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -102,7 +102,7 @@ sp<DataSource> DataSource::CreateFromURI( source = new FileSource(uri + 7); } else if (!strncasecmp("http://", uri, 7)) { source = new HTTPDataSource(uri, headers); - source = new CachingDataSource(source, 64 * 1024, 10); + source = new CachingDataSource(source, 32 * 1024, 20); } else { // Assume it's a filename. source = new FileSource(uri); diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index df6235f..c0cf97c 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -20,7 +20,6 @@ #include "include/StagefrightMetadataRetriever.h" -#include <media/stagefright/CachingDataSource.h> #include <media/stagefright/ColorConverter.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> |