Remove workaround for bug 6986

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1359 matching lines @@
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::SetRecPayloadType()");
 
   if (channel_state_.Get().playing) {
     _engineStatisticsPtr->SetLastError(
         VE_ALREADY_PLAYING, kTraceError,
         "SetRecPayloadType() unable to set PT while playing");
     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)
 
     int8_t pltype(-1);
     CodecInst rxCodec = codec;
 
     // Get payload type for the given codec
     rtp_payload_registry_->ReceivePayloadType(rxCodec, &pltype);
     rxCodec.pltype = pltype;
@@ skipping 1672 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc