summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-03-10 16:59:28 -0800
committerAndreas Huber <andih@google.com>2010-03-10 17:12:01 -0800
commit79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8 (patch)
tree0a7a4c2e85386559dcdbed4a4dfddf480dd1407f
parentd40b0e858558ba2cac7704e994eaa44ad41e6ad8 (diff)
downloadframeworks_av-79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8.zip
frameworks_av-79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8.tar.gz
frameworks_av-79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8.tar.bz2
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.
Change-Id: I799ce1d58d56a31088a89603d8a18d24780f5b57 related-to-bug: 2492187
-rw-r--r--include/media/stagefright/HTTPDataSource.h2
-rw-r--r--media/libstagefright/DataSource.cpp2
-rw-r--r--media/libstagefright/StagefrightMetadataRetriever.cpp1
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>