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 /cmds/stagefright/stagefright.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 'cmds/stagefright/stagefright.cpp')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 030bf1b..eb1db4b 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -28,6 +28,7 @@ #include <binder/IServiceManager.h> #include <binder/ProcessState.h> +#include <media/IMediaHTTPService.h> #include <media/IMediaPlayerService.h> #include <media/stagefright/foundation/ALooper.h> #include "include/NuCachedSource2.h" @@ -958,7 +959,8 @@ int main(int argc, char **argv) { const char *filename = argv[k]; - sp<DataSource> dataSource = DataSource::CreateFromURI(filename); + sp<DataSource> dataSource = + DataSource::CreateFromURI(NULL /* httpService */, filename); if (strncasecmp(filename, "sine:", 5) && dataSource == NULL) { fprintf(stderr, "Unable to create data source.\n"); |