diff options
| author | Andreas Huber <andih@google.com> | 2014-02-05 17:12:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-05 17:12:38 +0000 |
| commit | 412d4744efae64083e4f99a664e3efaba031af48 (patch) | |
| tree | 8b139d3c83c554f181e3b4cb93ca4a74e0655c94 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 4a25471795b05ffcfcc079e9f9cb5ed549023d14 (diff) | |
| parent | 1b86fe063badb5f28c467ade39be0f4008688947 (diff) | |
| download | frameworks_av-412d4744efae64083e4f99a664e3efaba031af48.zip frameworks_av-412d4744efae64083e4f99a664e3efaba031af48.tar.gz frameworks_av-412d4744efae64083e4f99a664e3efaba031af48.tar.bz2 | |
Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 47834fd..d35d1df 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -70,7 +70,9 @@ status_t NuPlayerDriver::setUID(uid_t uid) { } status_t NuPlayerDriver::setDataSource( - const char *url, const KeyedVector<String8, String8> *headers) { + const sp<IMediaHTTPService> &httpService, + const char *url, + const KeyedVector<String8, String8> *headers) { Mutex::Autolock autoLock(mLock); if (mState != STATE_IDLE) { @@ -79,7 +81,7 @@ status_t NuPlayerDriver::setDataSource( mState = STATE_SET_DATASOURCE_PENDING; - mPlayer->setDataSourceAsync(url, headers); + mPlayer->setDataSourceAsync(httpService, url, headers); while (mState == STATE_SET_DATASOURCE_PENDING) { mCondition.wait(mLock); |