summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/libavextensions/stagefright/AVExtensions.h4
-rw-r--r--media/libavextensions/stagefright/AVUtils.cpp4
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp2
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);