| commit | acd24551dfaec35f955ff97d437204e2c306322e | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Mon Apr 12 20:08:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 20:08:22 2021 +0000 |
| tree | 508939073dbd2885fe387f7b6a92f32394579c52 | |
| parent | d52ea144c25fd62cd40582a287cda19909fed061 [diff] | |
| parent | bf58beb65e4338dce79e210b1f07e27254a55f27 [diff] |
Merge "CCodec: Add bitrate as a standard parameter for decoders" am: bf58beb65e Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1582063 Change-Id: Ib984e06b1051456511abf1a4e309ef50e9a11b43
diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp index ad28545..090c02a 100644 --- a/media/codec2/sfplugin/CCodecConfig.cpp +++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -362,7 +362,10 @@ .limitTo(D::OUTPUT & D::READ)); add(ConfigMapper(KEY_BIT_RATE, C2_PARAMKEY_BITRATE, "value") - .limitTo(D::ENCODER & D::OUTPUT)); + .limitTo(D::ENCODER & D::CODED)); + // Some audio decoders require bitrate information to be set + add(ConfigMapper(KEY_BIT_RATE, C2_PARAMKEY_BITRATE, "value") + .limitTo(D::AUDIO & D::DECODER & D::CODED)); // we also need to put the bitrate in the max bitrate field add(ConfigMapper(KEY_MAX_BIT_RATE, C2_PARAMKEY_BITRATE, "value") .limitTo(D::ENCODER & D::READ & D::OUTPUT));