Remove workaround for bug 6986

BUG=webrtc:6986

Review-Url: https://codereview.webrtc.org/2681733002
Cr-Commit-Position: refs/heads/master@{#16933}
This commit is contained in:
kwiberg 2017-03-01 01:57:11 -08:00 committed by Commit bot
parent dc05017fc3
commit 09f090c40e

View File

@ -1377,20 +1377,7 @@ int32_t Channel::SetRecPayloadType(int payload_type,
return -1;
}
const CodecInst codec = [&] {
CodecInst c = SdpToCodecInst(payload_type, format);
// Bug 6986: Emulate an old bug that caused us to always choose to decode
// Opus in stereo. To be able to remove this, we first need to fix the
// other half of bug 6986, which is about losing the Opus "stereo"
// parameter.
// TODO(kwiberg): Remove this special case, a.k.a. fix bug 6986.
if (STR_CASE_CMP(codec.plname, "opus") == 0) {
c.channels = 2;
}
return c;
}();
const CodecInst codec = SdpToCodecInst(payload_type, format);
if (payload_type == -1) {
// De-register the selected codec (RTP/RTCP module and ACM)