diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-19 00:29:37 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-23 17:08:28 -0800 |
| commit | 29c75250c58bdcc3b38513813ba521cba82d5c61 (patch) | |
| tree | 046da9cbac5870beed59173bc641aa413b525004 /media/libavextensions | |
| parent | 186221ad96a20d975cfb41a91023cfde37e95872 (diff) | |
| download | frameworks_av-29c75250c58bdcc3b38513813ba521cba82d5c61.zip frameworks_av-29c75250c58bdcc3b38513813ba521cba82d5c61.tar.gz frameworks_av-29c75250c58bdcc3b38513813ba521cba82d5c61.tar.bz2 | |
stagefright: Welcome to my nightmare, act IV
* Standardize parameter names, clean up stub calls
* Attempting to make QC's blob work. We've entered
our last days on earth. All is lost, all is lost.
Change-Id: Idef9aad100f414e64a737e0f0a8c9c112ad4cb46
Diffstat (limited to 'media/libavextensions')
| -rw-r--r-- | media/libavextensions/mediaplayerservice/AVNuUtils.cpp | 2 | ||||
| -rw-r--r-- | media/libavextensions/stagefright/AVUtils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp index 85f07db..31d7b32 100644 --- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp +++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp @@ -107,7 +107,7 @@ audio_format_t AVNuUtils::getPCMFormat(const sp<AMessage> &format) { return (audio_format_t)pcmFormat; int32_t bits = 16; - if (format->findInt32("bit-width", &bits)) { + if (format->findInt32("bits-per-sample", &bits)) { if (bits == 8) return AUDIO_FORMAT_PCM_8_BIT; if (bits == 24) diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp index 50c0f89..2d5208f 100644 --- a/media/libavextensions/stagefright/AVUtils.cpp +++ b/media/libavextensions/stagefright/AVUtils.cpp @@ -68,7 +68,7 @@ int AVUtils::getAudioSampleBits(const sp<MetaData> &) { int AVUtils::getAudioSampleBits(const sp<AMessage> &format) { int32_t bits = 16; - format->findInt32("bit-width", &bits); + format->findInt32("bits-per-sample", &bits); return bits; } |