From 09f090c40e7037ea64b57daaa8f96d0e04bd257c Mon Sep 17 00:00:00 2001
From: kwiberg <kwiberg@webrtc.org>
Date: Wed, 1 Mar 2017 01:57:11 -0800
Subject: [PATCH] Remove workaround for bug 6986

BUG=webrtc:6986

Review-Url: https://codereview.webrtc.org/2681733002
Cr-Commit-Position: refs/heads/master@{#16933}
---
 webrtc/voice_engine/channel.cc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 11e631512c..60e213d291 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -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)