diff options
author | Andreas Huber <andih@google.com> | 2011-04-19 11:50:27 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-04-20 09:22:06 -0700 |
commit | ad0d9c9c39a24b7fbd94e935a5855c9025341929 (patch) | |
tree | 1757b447d0d0ecb2d5d275dbb0506d3140939abc /media/libstagefright | |
parent | 7bf8413f91fc072452f315a91618aeef2574d420 (diff) | |
download | frameworks_av-ad0d9c9c39a24b7fbd94e935a5855c9025341929.zip frameworks_av-ad0d9c9c39a24b7fbd94e935a5855c9025341929.tar.gz frameworks_av-ad0d9c9c39a24b7fbd94e935a5855c9025341929.tar.bz2 |
Add extra headers specified in the media player's setDataSource call
to all http requests made by the http live implementation.
Change-Id: I9dd78bb261bc678ea98c82009ca2634b74f3cd58
related-to-bug: 4315346
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 23 | ||||
-rw-r--r-- | media/libstagefright/include/LiveSession.h | 9 |
2 files changed, 29 insertions, 3 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 8e1bdf3..012d9ad 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -67,9 +67,17 @@ sp<DataSource> LiveSession::getDataSource() { return mDataSource; } -void LiveSession::connect(const char *url) { +void LiveSession::connect( + const char *url, const KeyedVector<String8, String8> *headers) { sp<AMessage> msg = new AMessage(kWhatConnect, id()); msg->setString("url", url); + + if (headers != NULL) { + msg->setPointer( + "headers", + new KeyedVector<String8, String8>(*headers)); + } + msg->post(); } @@ -144,6 +152,16 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { AString url; CHECK(msg->findString("url", &url)); + KeyedVector<String8, String8> *headers = NULL; + if (!msg->findPointer("headers", (void **)&headers)) { + mExtraHeaders.clear(); + } else { + mExtraHeaders = *headers; + + delete headers; + headers = NULL; + } + if (!(mFlags & kFlagIncognito)) { LOGI("onConnect '%s'", url.c_str()); } else { @@ -210,7 +228,8 @@ status_t LiveSession::fetchFile(const char *url, sp<ABuffer> *out) { } } - status_t err = mHTTPDataSource->connect(url); + status_t err = mHTTPDataSource->connect( + url, mExtraHeaders.isEmpty() ? NULL : &mExtraHeaders); if (err != OK) { return err; diff --git a/media/libstagefright/include/LiveSession.h b/media/libstagefright/include/LiveSession.h index 2b5ea0e..99abe64 100644 --- a/media/libstagefright/include/LiveSession.h +++ b/media/libstagefright/include/LiveSession.h @@ -20,6 +20,8 @@ #include <media/stagefright/foundation/AHandler.h> +#include <utils/String8.h> + namespace android { struct ABuffer; @@ -37,7 +39,10 @@ struct LiveSession : public AHandler { sp<DataSource> getDataSource(); - void connect(const char *url); + void connect( + const char *url, + const KeyedVector<String8, String8> *headers = NULL); + void disconnect(); // Blocks until seek is complete. @@ -78,6 +83,8 @@ private: sp<HTTPBase> mHTTPDataSource; AString mMasterURL; + KeyedVector<String8, String8> mExtraHeaders; + Vector<BandwidthItem> mBandwidthItems; KeyedVector<AString, sp<ABuffer> > mAESKeyForURI; |