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/libstagefright/FFMPEGSoftCodec.cpp | |
| 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/libstagefright/FFMPEGSoftCodec.cpp')
| -rw-r--r-- | media/libstagefright/FFMPEGSoftCodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/FFMPEGSoftCodec.cpp b/media/libstagefright/FFMPEGSoftCodec.cpp index 5c6a8ed..6b12a41 100644 --- a/media/libstagefright/FFMPEGSoftCodec.cpp +++ b/media/libstagefright/FFMPEGSoftCodec.cpp @@ -53,7 +53,7 @@ static const MetaKeyEntry MetaKeyTable[] { {kKeyAACAOT , "aac-profile" , INT32}, {kKeyArbitraryMode , "use-arbitrary-mode" , INT32}, {kKeyBitRate , "bitrate" , INT32}, - {kKeyBitsPerSample , "bit-width" , INT32}, + {kKeyBitsPerSample , "bits-per-sample" , INT32}, {kKeyBlockAlign , "block-align" , INT32}, {kKeyChannelCount , "channel-count" , INT32}, {kKeyCodecId , "codec-id" , INT32}, @@ -404,7 +404,7 @@ status_t FFMPEGSoftCodec::getAudioPortFormat(OMX_U32 portIndex, int coding, notify->setString("mime", MEDIA_MIMETYPE_AUDIO_APE); notify->setInt32("channel-count", params.nChannels); notify->setInt32("sample-rate", params.nSamplingRate); - notify->setInt32("bit-width", params.nBitsPerSample); + notify->setInt32("bits-per-sample", params.nBitsPerSample); break; } case OMX_AUDIO_CodingFLAC: @@ -422,7 +422,7 @@ status_t FFMPEGSoftCodec::getAudioPortFormat(OMX_U32 portIndex, int coding, notify->setString("mime", MEDIA_MIMETYPE_AUDIO_FLAC); notify->setInt32("channel-count", params.nChannels); notify->setInt32("sample-rate", params.nSampleRate); - notify->setInt32("bit-width", params.nCompressionLevel); // piggyback + notify->setInt32("bits-per-sample", params.nCompressionLevel); // piggyback break; } @@ -821,7 +821,7 @@ status_t FFMPEGSoftCodec::setWMAFormat( // mm-parser may want a different bit depth if (msg->findInt32(getMsgKey(kKeyWMABitspersample), &bitsPerSample)) { - msg->setInt32("bit-width", bitsPerSample); + msg->setInt32("bits-per-sample", bitsPerSample); } ALOGV("Channels: %d, SampleRate: %d, BitRate: %d, blockAlign: %d", |