(Re-land) AudioEncoderDecoderIsac: Merge the two config structs

This reverts commit 599beb86, which in turn reverted 7c324cac. What
makes it work this time is that we don't remove the option of setting
bit_rate to 0 in order to ask for the default value.

COAUTHOR=henrik.lundin@webrtc.org
BUG=4228, chromium:478161
R=henrik.lundin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/48199004

Cr-Commit-Position: refs/heads/master@{#9068}
This commit is contained in:
Karl Wiberg
2015-04-23 14:07:06 +02:00
parent 92f9eacd13
commit d3e8eda839
6 changed files with 105 additions and 127 deletions

View File

@ -108,6 +108,7 @@
'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',
'audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc',
'audio_coding/codecs/isac/fix/source/transform_unittest.cc',
'audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc',
'audio_coding/codecs/isac/main/source/isac_unittest.cc',
'audio_coding/codecs/opus/audio_encoder_opus_unittest.cc',
'audio_coding/codecs/opus/opus_unittest.cc',