summaryrefslogtreecommitdiffstats
path: root/media/libavextensions
diff options
context:
space:
mode:
authorSharad Sangle <assangle@codeaurora.org>2015-08-12 12:53:58 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:45 -0600
commit7073a04c8c51771d80d3180d83814de51062b3b7 (patch)
treec6cb4c3dba34a7561ec94498451774577a39accb /media/libavextensions
parent3b0e43e92b6a81e22e44edabd7688cff8e760500 (diff)
downloadframeworks_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/libavextensions')
-rw-r--r--media/libavextensions/stagefright/AVExtensions.h4
-rw-r--r--media/libavextensions/stagefright/AVUtils.cpp4
2 files changed, 4 insertions, 4 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;
}