From 62b72bd494558a169c0ed307cad8f92a73b8cdd1 Mon Sep 17 00:00:00 2001 From: SathishKumar Mani Date: Thu, 13 Aug 2015 11:01:45 -0700 Subject: audio: add support for wma-pro wma-lossless decoding added support for wma-pro and wma-lossless audio decoding Change-Id: I73ae2c2ccabafebc49d4b2e074da23cb4e51a3ce --- media/libavextensions/stagefright/AVExtensions.h | 2 +- media/libavextensions/stagefright/AVUtils.cpp | 2 +- media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'media') 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& meta, AudioParameter *param); virtual sp createCustomComponentByName(const sp &looper, - const char* mime, bool encoder); + const char* mime, bool encoder, const sp &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 AVUtils::createCustomComponentByName( - const sp &, const char* , bool ) { + const sp &, const char* , bool, const sp &) { 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 &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 */); } -- cgit v1.1