summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/StagefrightMetadataRetriever.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-21 11:23:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-21 11:23:15 -0700
commitc8a8472a0205dd698c8d81bf7e09026ca1013d1e (patch)
treed4200abc40d050b0b65f716b68acb04886a6820c /media/libstagefright/StagefrightMetadataRetriever.cpp
parent1d54b3e0ec3d1ef17e75fec6f97be59f29721fff (diff)
parentaf8791e112c8072452bd14ef3c43a47511d19542 (diff)
downloadframeworks_av-c8a8472a0205dd698c8d81bf7e09026ca1013d1e.zip
frameworks_av-c8a8472a0205dd698c8d81bf7e09026ca1013d1e.tar.gz
frameworks_av-c8a8472a0205dd698c8d81bf7e09026ca1013d1e.tar.bz2
Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"
Diffstat (limited to 'media/libstagefright/StagefrightMetadataRetriever.cpp')
-rw-r--r--media/libstagefright/StagefrightMetadataRetriever.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index 6f67ba7..4095fbf 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -48,7 +48,8 @@ StagefrightMetadataRetriever::~StagefrightMetadataRetriever() {
mClient.disconnect();
}
-status_t StagefrightMetadataRetriever::setDataSource(const char *uri) {
+status_t StagefrightMetadataRetriever::setDataSource(
+ const char *uri, const KeyedVector<String8, String8> *headers) {
LOGV("setDataSource(%s)", uri);
mParsedMetaData = false;
@@ -56,7 +57,7 @@ status_t StagefrightMetadataRetriever::setDataSource(const char *uri) {
delete mAlbumArt;
mAlbumArt = NULL;
- mSource = DataSource::CreateFromURI(uri);
+ mSource = DataSource::CreateFromURI(uri, headers);
if (mSource == NULL) {
return UNKNOWN_ERROR;