Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ec5cc2 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 0533aade: Merge change I313953dc into eclair-mr2 

Merge commit '0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp

* commit '0533aadef6d93dec868d648402f5ec326161de57':
  Support raw audio sources in MediaPlayerImpl.
parents 9d753222 01b8bbb3

media/libstagefright/MediaPlayerImpl.cpp

+10 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <media/stagefright/AudioPlayer.h>

// #include <media/stagefright/CameraSource.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaExtractor.h>

#include <media/stagefright/MediaPlayerImpl.h>

#include <media/stagefright/MetaData.h>
@@ -391,9 +392,16 @@ void MediaPlayerImpl::setAudioSource(const sp<MediaSource> &source) { 


    sp<MetaData> meta = source->getFormat();



    const char *mime;

    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) {

    LOGI("setVideoSource");