diff options
| author | Sharad Sangle <assangle@codeaurora.org> | 2015-08-12 12:53:58 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:45 -0600 |
| commit | 7073a04c8c51771d80d3180d83814de51062b3b7 (patch) | |
| tree | c6cb4c3dba34a7561ec94498451774577a39accb /media | |
| parent | 3b0e43e92b6a81e22e44edabd7688cff8e760500 (diff) | |
| download | frameworks_av-7073a04c8c51771d80d3180d83814de51062b3b7.zip frameworks_av-7073a04c8c51771d80d3180d83814de51062b3b7.tar.gz frameworks_av-7073a04c8c51771d80d3180d83814de51062b3b7.tar.bz2 | |
audio: use updated method for getting sample bits
method getPcmSampleBits is now getAudioSampleBits as it is
extended for WMA, so use the updated method
Change-Id: Ic0620fd009a8544db138f088cfd2e7e4a4ff390c
Diffstat (limited to 'media')
| -rw-r--r-- | media/libavextensions/stagefright/AVExtensions.h | 4 | ||||
| -rw-r--r-- | media/libavextensions/stagefright/AVUtils.cpp | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h index 9cf1413..818cdb1 100644 --- a/media/libavextensions/stagefright/AVExtensions.h +++ b/media/libavextensions/stagefright/AVExtensions.h @@ -83,8 +83,8 @@ struct AVUtils { virtual bool is24bitPCMOffloadEnabled(); virtual bool is16bitPCMOffloadEnabled(); - virtual int getPcmSampleBits(const sp<MetaData> &); - virtual int getPcmSampleBits(const sp<AMessage> &); + virtual int getAudioSampleBits(const sp<MetaData> &); + virtual int getAudioSampleBits(const sp<AMessage> &); virtual void setPcmSampleBits(const sp<MetaData> &, int32_t /*bitWidth*/); virtual void setPcmSampleBits(const sp<AMessage> &, int32_t /*bitWidth*/); diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp index dad8d15..502154f 100644 --- a/media/libavextensions/stagefright/AVUtils.cpp +++ b/media/libavextensions/stagefright/AVUtils.cpp @@ -62,11 +62,11 @@ status_t AVUtils::sendMetaDataToHal( bool AVUtils::is24bitPCMOffloadEnabled() {return false;} bool AVUtils::is16bitPCMOffloadEnabled() {return false;} -int AVUtils::getPcmSampleBits(const sp<MetaData> &) { +int AVUtils::getAudioSampleBits(const sp<MetaData> &) { return 16; } -int AVUtils::getPcmSampleBits(const sp<AMessage> &) { +int AVUtils::getAudioSampleBits(const sp<AMessage> &) { return 16; } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index ca7c1f4..708e958 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -1674,7 +1674,7 @@ status_t NuPlayer::Renderer::onOpenAudioSink( audioFormat = AVUtils::get()->updateAudioFormat(audioFormat, format); - bitWidth = AVUtils::get()->getPcmSampleBits(format); + bitWidth = AVUtils::get()->getAudioSampleBits(format); int avgBitRate = -1; format->findInt32("bit-rate", &avgBitRate); |