Pass SdpAudioFormat through Channel, without converting to CodecInst

webrtc/voice_engine/voe_codec_impl.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.
  */
 
+#include <sstream>
+
 #include "webrtc/voice_engine/voe_codec_impl.h"
 
 #include "webrtc/base/format_macros.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
@@ skipping 151 matching lines @@
   voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
   voe::Channel* channelPtr = ch.channel();
   if (channelPtr == NULL) {
     _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
                           "GetRecPayloadType() failed to locate channel");
     return -1;
   }
   return channelPtr->SetRecPayloadType(codec);
 }
 
+int VoECodecImpl::SetRecPayloadType(int channel,
+                                    int payload_type,
+                                    const SdpAudioFormat& format) {
+  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
+               "SetRecPayloadType(channel=%d, payload_type=%d, format)",
+               channel, payload_type);
+  auto sdp_fmt = [](const SdpAudioFormat& format) {
+    std::ostringstream o;
+    o << format;
+    return o.str();
+  };
+  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
+               "format: %s", sdp_fmt(format).c_str());
+  if (!_shared->statistics().Initialized()) {
+    _shared->SetLastError(VE_NOT_INITED, kTraceError);
+    return -1;
+  }
+  voe::Channel* const channel_ptr =
+      _shared->channel_manager().GetChannel(channel).channel();
+  if (!channel_ptr) {
+    _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
+                          "GetRecPayloadType() failed to locate channel");
+    return -1;
+  }
+  return channel_ptr->SetRecPayloadType(payload_type, format);
+}
+
 int VoECodecImpl::GetRecPayloadType(int channel, CodecInst& codec) {
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
   voe::Channel* channelPtr = ch.channel();
   if (channelPtr == NULL) {
     _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
                           "GetRecPayloadType() failed to locate channel");
@@ skipping 197 matching lines @@
     _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
                           "GetOpusDtx failed to locate channel");
     return -1;
   }
   return channelPtr->GetOpusDtx(enabled);
 }
 
 #endif  // WEBRTC_VOICE_ENGINE_CODEC_API
 
 }  // namespace webrtc