Chromium Code Reviews| Index: webrtc/modules/audio_coding/acm2/codec_manager.cc |
| diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.cc b/webrtc/modules/audio_coding/acm2/codec_manager.cc |
| index bc507dd8c7debf614b0263eedaa09c256e081bde..d8ef2bf9d5da33f5495d0986f8d05215dc2d5877 100644 |
| --- a/webrtc/modules/audio_coding/acm2/codec_manager.cc |
| +++ b/webrtc/modules/audio_coding/acm2/codec_manager.cc |
| @@ -166,7 +166,9 @@ bool CodecManager::SetVAD(bool enable, ACMVADMode mode) { |
| return false; |
| } |
| - if (CurrentEncoderIsOpus()) { |
| + // TODO(kwiberg): This doesn't protect Opus when injected as an external |
| + // encoder. |
|
kwiberg-webrtc
2015/12/15 11:59:12
Henrik, this is the thing I brought up at lunch. T
hlundin-webrtc
2015/12/15 13:46:36
Acknowledged.
|
| + if (send_codec_inst_ && IsOpus(*send_codec_inst_)) { |
| // VAD/DTX not supported, but don't fail. |
| enable = false; |
| } |
| @@ -187,9 +189,5 @@ bool CodecManager::SetCodecFEC(bool enable_codec_fec) { |
| return true; |
| } |
| -bool CodecManager::CurrentEncoderIsOpus() const { |
| - return send_codec_inst_ ? IsOpus(*send_codec_inst_) : false; |
| -} |
| - |
| } // namespace acm2 |
| } // namespace webrtc |