Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I313953dc into eclair-mr2

Browse Source 
* changes:
  Support raw audio sources in MediaPlayerImpl.
This commit is contained in:
Android (Google) Code Review
2009-11-04 13:33:13 -05:00
parent 12bc3af0fb 313953dccb
commit 0533aadef6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/libstagefright/MediaPlayerImpl.cpp
View File

@@ -28,6 +28,7 @@
#include <media/stagefright/AudioPlayer.h> #include <media/stagefright/AudioPlayer.h>
// #include <media/stagefright/CameraSource.h> // #include <media/stagefright/CameraSource.h>
#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MediaPlayerImpl.h> #include <media/stagefright/MediaPlayerImpl.h>
#include <media/stagefright/MetaData.h> #include <media/stagefright/MetaData.h>
@@ -391,8 +392,15 @@ void MediaPlayerImpl::setAudioSource(const sp<MediaSource> &source) {
sp<MetaData> meta = source->getFormat(); sp<MetaData> meta = source->getFormat();
mAudioDecoder = OMXCodec::Create( const char *mime;
mClient.interface(), meta, false /* createEncoder */, source); CHECK(meta->findCString(kKeyMIMEType, &mime));
if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_RAW)) {
mAudioDecoder = source;
} else {
mAudioDecoder = OMXCodec::Create(
mClient.interface(), meta, false /* createEncoder */, source);
}
} }
void MediaPlayerImpl::setVideoSource(const sp<MediaSource> &source) { void MediaPlayerImpl::setVideoSource(const sp<MediaSource> &source) {