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 /services | |
| 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 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index eeedfc9..dcea760 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -32,6 +32,7 @@ #include <gui/Surface.h> #include <hardware/hardware.h> #include <media/AudioSystem.h> +#include <media/IMediaHTTPService.h> #include <media/mediaplayer.h> #include <utils/Errors.h> #include <utils/Log.h> @@ -866,7 +867,7 @@ void CameraService::setCameraFree(int cameraId) { MediaPlayer* CameraService::newMediaPlayer(const char *file) { MediaPlayer* mp = new MediaPlayer(); - if (mp->setDataSource(file, NULL) == NO_ERROR) { + if (mp->setDataSource(NULL /* httpService */, file, NULL) == NO_ERROR) { mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE); mp->prepare(); } else { |