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/libstagefright/omx | |
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/libstagefright/omx')
-rw-r--r-- | media/libstagefright/omx/tests/OMXHarness.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index 4bee808..499545e 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -25,6 +25,7 @@ #include <binder/ProcessState.h> #include <binder/IServiceManager.h> #include <binder/MemoryDealer.h> +#include <media/IMediaHTTPService.h> #include <media/IMediaPlayerService.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/ALooper.h> @@ -241,7 +242,8 @@ private: }; static sp<MediaExtractor> CreateExtractorFromURI(const char *uri) { - sp<DataSource> source = DataSource::CreateFromURI(uri); + sp<DataSource> source = + DataSource::CreateFromURI(NULL /* httpService */, uri); if (source == NULL) { return NULL; |