Voice Engine: Remove RED support

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 1010 matching lines @@
       if (!codec_manager_.RegisterEncoder(codec) ||
           !codec_manager_.MakeEncoder(&rent_a_codec_, audio_coding_.get()) ||
           !RegisterReceiveCodec(&audio_coding_, &rent_a_codec_, codec) ||
           _rtpRtcpModule->RegisterSendPayload(codec) == -1) {
         WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
                      "Channel::Init() failed to register CN (%d/%d) "
                      "correctly - 1",
                      codec.pltype, codec.plfreq);
       }
     }
-#ifdef WEBRTC_CODEC_RED
-    // Register RED to the receiving side of the ACM.
-    // We will not receive an OnInitializeDecoder() callback for RED.
-    if (!STR_CASE_CMP(codec.plname, "RED")) {
-      if (!RegisterReceiveCodec(&audio_coding_, &rent_a_codec_, codec)) {
-        WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
-                     "Channel::Init() failed to register RED (%d/%d) "
-                     "correctly",
-                     codec.pltype, codec.plfreq);
-      }
-    }
-#endif
   }
 
   if (rx_audioproc_->noise_suppression()->set_level(kDefaultNsMode) != 0) {
     LOG(LS_ERROR) << "noise_suppression()->set_level(kDefaultNsMode) failed.";
     return -1;
   }
   if (rx_audioproc_->gain_control()->set_mode(kDefaultRxAgcMode) != 0) {
     LOG(LS_ERROR) << "gain_control()->set_mode(kDefaultRxAgcMode) failed.";
     return -1;
   }
@@ skipping 1814 matching lines @@
   stats.packetsReceived = packetsReceived;
 
   // --- Timestamps
   {
     rtc::CritScope lock(&ts_stats_lock_);
     stats.capture_start_ntp_time_ms_ = capture_start_ntp_time_ms_;
   }
   return 0;
 }
 
-int Channel::SetREDStatus(bool enable, int redPayloadtype) {
-  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
-               "Channel::SetREDStatus()");
-
-  if (enable) {
-    if (redPayloadtype < 0 || redPayloadtype > 127) {
-      _engineStatisticsPtr->SetLastError(
-          VE_PLTYPE_ERROR, kTraceError,
-          "SetREDStatus() invalid RED payload type");
-      return -1;
-    }
-
-    if (SetRedPayloadType(redPayloadtype) < 0) {

[the sun, 2016/06/13 08:17:39]

Can you remove SetRedPayloadType() as well?

[kwiberg-webrtc, 2016/06/13 11:21:14]

Indeed I can. Good catch.

-      _engineStatisticsPtr->SetLastError(
-          VE_CODEC_ERROR, kTraceError,
-          "SetSecondarySendCodec() Failed to register RED ACM");
-      return -1;
-    }
-  }
-
-  if (!codec_manager_.SetCopyRed(enable) ||
-      !codec_manager_.MakeEncoder(&rent_a_codec_, audio_coding_.get())) {
-    _engineStatisticsPtr->SetLastError(
-        VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
-        "SetREDStatus() failed to set RED state in the ACM");
-    return -1;
-  }
-  return 0;
-}
-
-int Channel::GetREDStatus(bool& enabled, int& redPayloadtype) {
-  enabled = codec_manager_.GetStackParams()->use_red;
-  if (enabled) {
-    int8_t payloadType = 0;
-    if (_rtpRtcpModule->SendREDPayloadType(&payloadType) != 0) {
-      _engineStatisticsPtr->SetLastError(
-          VE_RTP_RTCP_MODULE_ERROR, kTraceError,
-          "GetREDStatus() failed to retrieve RED PT from RTP/RTCP "
-          "module");
-      return -1;
-    }
-    redPayloadtype = payloadType;
-    return 0;
-  }
-  return 0;
-}
-
 int Channel::SetCodecFECStatus(bool enable) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::SetCodecFECStatus()");
 
   if (!codec_manager_.SetCodecFEC(enable) ||
       !codec_manager_.MakeEncoder(&rent_a_codec_, audio_coding_.get())) {
     _engineStatisticsPtr->SetLastError(
         VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
         "SetCodecFECStatus() failed to set FEC state");
     return -1;
@@ skipping 551 matching lines @@
 
   codec.pltype = red_payload_type;
   if (!codec_manager_.RegisterEncoder(codec) ||
       !codec_manager_.MakeEncoder(&rent_a_codec_, audio_coding_.get())) {
     _engineStatisticsPtr->SetLastError(
         VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
         "SetRedPayloadType() RED registration in ACM module failed");
     return -1;
   }
 
   if (_rtpRtcpModule->SetSendREDPayloadType(red_payload_type) != 0) {

[the sun, 2016/06/13 08:21:17]

Can you make a follow-up CL to remove also RtpRtcp::SetSendREDPayloadType() and
RtpRtcp::SendREDPayloadType()? They appear unused once
voe::Channel::SetRedPayloadType() is removed.

[kwiberg-webrtc, 2016/06/13 11:21:14]

Good idea. https://codereview.webrtc.org/2066473002

     _engineStatisticsPtr->SetLastError(
         VE_RTP_RTCP_MODULE_ERROR, kTraceError,
         "SetRedPayloadType() RED registration in RTP/RTCP module failed");
     return -1;
   }
   return 0;
 }
 
 int Channel::SetSendRtpHeaderExtension(bool enable,
                                        RTPExtensionType type,
@@ skipping 71 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