diff options
| author | Andreas Huber <andih@google.com> | 2014-01-29 11:13:26 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2014-02-04 15:11:53 -0800 |
| commit | 1b86fe063badb5f28c467ade39be0f4008688947 (patch) | |
| tree | d88660112d407540184ad8e1292ed8aa98fae317 /media/libmedia/SoundPool.cpp | |
| parent | 5ce88270eb2d41462de8c4155673b802b2ca48cb (diff) | |
| download | frameworks_av-1b86fe063badb5f28c467ade39be0f4008688947.zip frameworks_av-1b86fe063badb5f28c467ade39be0f4008688947.tar.gz frameworks_av-1b86fe063badb5f28c467ade39be0f4008688947.tar.bz2 | |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
Diffstat (limited to 'media/libmedia/SoundPool.cpp')
| -rw-r--r-- | media/libmedia/SoundPool.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp index 98acd1f..9ed010d 100644 --- a/media/libmedia/SoundPool.cpp +++ b/media/libmedia/SoundPool.cpp @@ -21,6 +21,7 @@ #define USE_SHARED_MEM_BUFFER #include <media/AudioTrack.h> +#include <media/IMediaHTTPService.h> #include <media/mediaplayer.h> #include <media/SoundPool.h> #include "SoundPoolThread.h" @@ -496,7 +497,14 @@ status_t Sample::doLoad() ALOGV("Start decode"); if (mUrl) { - status = MediaPlayer::decode(mUrl, &sampleRate, &numChannels, &format, mHeap, &mSize); + status = MediaPlayer::decode( + NULL /* httpService */, + mUrl, + &sampleRate, + &numChannels, + &format, + mHeap, + &mSize); } else { status = MediaPlayer::decode(mFd, mOffset, mLength, &sampleRate, &numChannels, &format, mHeap, &mSize); |