diff options
author | SathishKumar Mani <smani@codeaurora.org> | 2015-08-13 11:01:45 -0700 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:37 -0600 |
commit | 62b72bd494558a169c0ed307cad8f92a73b8cdd1 (patch) | |
tree | 201d4def50d9a06a7ddfe36e274a880e1aae084a /media | |
parent | 1ea539f4af155d3acc635e59cbdafab255b06c54 (diff) | |
download | frameworks_av-62b72bd494558a169c0ed307cad8f92a73b8cdd1.zip frameworks_av-62b72bd494558a169c0ed307cad8f92a73b8cdd1.tar.gz frameworks_av-62b72bd494558a169c0ed307cad8f92a73b8cdd1.tar.bz2 |
audio: add support for wma-pro wma-lossless decoding
added support for wma-pro and wma-lossless audio
decoding
Change-Id: I73ae2c2ccabafebc49d4b2e074da23cb4e51a3ce
Diffstat (limited to 'media')
-rw-r--r-- | media/libavextensions/stagefright/AVExtensions.h | 2 | ||||
-rw-r--r-- | media/libavextensions/stagefright/AVUtils.cpp | 2 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h index 8ac21a1..33f19d3 100644 --- a/media/libavextensions/stagefright/AVExtensions.h +++ b/media/libavextensions/stagefright/AVExtensions.h @@ -75,7 +75,7 @@ struct AVUtils { virtual status_t sendMetaDataToHal(const sp<MetaData>& meta, AudioParameter *param); virtual sp<MediaCodec> createCustomComponentByName(const sp<ALooper> &looper, - const char* mime, bool encoder); + const char* mime, bool encoder, const sp<AMessage> &format); virtual bool isEnhancedExtension(const char *extension); virtual bool is24bitPCMOffloadEnabled(); diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp index 64bbc03..dad8d15 100644 --- a/media/libavextensions/stagefright/AVUtils.cpp +++ b/media/libavextensions/stagefright/AVUtils.cpp @@ -97,7 +97,7 @@ DataSource::SnifferFunc AVUtils::getExtendedSniffer() { } sp<MediaCodec> AVUtils::createCustomComponentByName( - const sp<ALooper> &, const char* , bool ) { + const sp<ALooper> &, const char* , bool, const sp<AMessage> &) { return NULL; } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 3b77bc2..b0a1f7f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -252,7 +252,7 @@ void NuPlayer::Decoder::onConfigure(const sp<AMessage> &format) { mComponentName.append(" decoder"); ALOGV("[%s] onConfigure (surface=%p)", mComponentName.c_str(), mSurface.get()); - mCodec = AVUtils::get()->createCustomComponentByName(mCodecLooper, mime.c_str(), false /* encoder */); + mCodec = AVUtils::get()->createCustomComponentByName(mCodecLooper, mime.c_str(), false /* encoder */, format); if (mCodec == NULL) { mCodec = MediaCodec::CreateByType(mCodecLooper, mime.c_str(), false /* encoder */); } |