Remove remaining calls to VoE APIs from Audio[Send|Receive]Stream.

webrtc/voice_engine/channel_proxy.cc

 /*
  *  Copyright (c) 2015 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 279 matching lines @@
   delay_ms = std::max(0, std::min(delay_ms, 10000));
   int error = channel()->SetMinimumPlayoutDelay(delay_ms);
   RTC_DCHECK_EQ(0, error);
 }
 
 void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   channel()->SetRtcpRttStats(rtcp_rtt_stats);
 }
 
+bool ChannelProxy::GetRecCodec(CodecInst* codec_inst) const {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return channel()->GetRecCodec(*codec_inst) == 0;
+}
+
+bool ChannelProxy::GetSendCodec(CodecInst* codec_inst) const {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return channel()->GetSendCodec(*codec_inst) == 0;
+}
+
+bool ChannelProxy::SetVADStatus(bool enable) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return channel()->SetVADStatus(enable, VADNormal, false) == 0;
+}
+
+bool ChannelProxy::SetCodecFECStatus(bool enable) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return channel()->SetCodecFECStatus(enable) == 0;
+}
+
+bool ChannelProxy::SetOpusDtx(bool enable) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return channel()->SetOpusDtx(enable) == 0;
+}
+
+bool ChannelProxy::SetOpusMaxPlaybackRate(int frequency_hz) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return channel()->SetOpusMaxPlaybackRate(frequency_hz) == 0;
+}
+
+bool ChannelProxy::SetSendCodec(const CodecInst& codec_inst) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  // Validation code copied from VoECodecImpl::SetSendCodec().
+  if ((STR_CASE_CMP(codec_inst.plname, "L16") == 0) &&
+      (codec_inst.pacsize >= 960)) {
+    return false;
+  }
+  if (!STR_CASE_CMP(codec_inst.plname, "CN") ||
+      !STR_CASE_CMP(codec_inst.plname, "TELEPHONE-EVENT") ||
+      !STR_CASE_CMP(codec_inst.plname, "RED")) {
+    return false;
+  }
+  if ((codec_inst.channels != 1) && (codec_inst.channels != 2)) {
+    return false;
+  }
+  if (!AudioCodingModule::IsCodecValid(codec_inst)) {
+    return false;
+  }
+  return channel()->SetSendCodec(codec_inst) == 0;
+}
+
+bool ChannelProxy::SetSendCNPayloadType(int type,
+                                        PayloadFrequencies frequency) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  // Validation code copied from VoECodecImpl::SetSendCNPayloadType().

[ossu, 2017/02/06 14:07:00]

Not directly related to this CL, as the code is taken as-is from VoECodecImpl,
but to me it really doesn't make any sense. The relevant RFCs do not prohibit
remapping, or even duplicating, CN payload ids, though there is a static mapping
for CN/8000 to use if no signalling is performed. Eventually, I believe we want
to remove this validation, but not for this CL.

[the sun, 2017/02/06 19:35:28]

Acknowledged.

+  if (type < 96 || type > 127) {
+    // Only allow dynamic range: 96 to 127
+    return false;
+  }
+  if ((frequency != kFreq16000Hz) && (frequency != kFreq32000Hz)) {
+    // It is not possible to modify the payload type for CN/8000.
+    // We only allow modification of the CN payload type for CN/16000
+    // and CN/32000.
+    return false;
+  }
+  return channel()->SetSendCNPayloadType(type, frequency) == 0;
+}
+
 Channel* ChannelProxy::channel() const {
   RTC_DCHECK(channel_owner_.channel());
   return channel_owner_.channel();
 }
 
 }  // namespace voe
 }  // namespace webrtc