Add field VideoEncoderConfig::codec_type.

First step of the transition needed to reland cl
https://webrtc-review.googlesource.com/62062, and move payload_name
and payload_type out of VideoSendStream::Config::EncoderSettings.

If the new field is set to something different than kVideoCodecUnkown,
payload_name from EncoderSettings is ignored.

Bug: webrtc:8830
Change-Id: I515a91f8291cda79017332102cc6a10736d8a648
Reviewed-on: https://webrtc-review.googlesource.com/64001
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22555}

call/video_config.cc

@@ -46,7 +46,8 @@ std::string VideoStream::ToString() const {
 }
 
 VideoEncoderConfig::VideoEncoderConfig()
-    : content_type(ContentType::kRealtimeVideo),
+    : codec_type(kVideoCodecUnknown),
+      content_type(ContentType::kRealtimeVideo),
       encoder_specific_settings(nullptr),
       min_transmit_bitrate_bps(0),
       max_bitrate_bps(0),
@@ -59,7 +60,9 @@ VideoEncoderConfig::~VideoEncoderConfig() = default;
 
 std::string VideoEncoderConfig::ToString() const {
   std::stringstream ss;
-  ss << "{content_type: ";
+  ss << "{codec_type: ";
+  ss << CodecTypeToPayloadString(codec_type);
+  ss << ", content_type: ";
   switch (content_type) {
     case ContentType::kRealtimeVideo:
       ss << "kRealtimeVideo";

call/video_config.h

@@ -126,6 +126,11 @@ class VideoEncoderConfig {
   ~VideoEncoderConfig();
   std::string ToString() const;
 
+  // TODO(nisse): This codec_type member is intended to be the new way
+  // to say which codec to use, when
+  // VideoSendStream::Config::EncoderSettings::payload_name is
+  // deleted. For the transition, both need to coexist.
+  VideoCodecType codec_type;
   rtc::scoped_refptr<VideoStreamFactoryInterface> video_stream_factory;
   std::vector<SpatialLayer> spatial_layers;
   ContentType content_type;

modules/video_coding/include/video_codec_initializer.h

@@ -49,8 +49,8 @@ class VideoCodecInitializer {
   static VideoCodec VideoEncoderConfigToVideoCodec(
       const VideoEncoderConfig& config,
       const std::vector<VideoStream>& streams,
-      const std::string& payload_name,
+      // TODO(nisse): Delete when we can rely on config.codec_type.
-      int payload_type,
+      VideoCodecType codec_type,
       bool nack_enabled);
 };
 

modules/video_coding/video_codec_initializer.cc

@@ -31,13 +31,18 @@ bool VideoCodecInitializer::SetupCodec(
     bool nack_enabled,
     VideoCodec* codec,
     std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator) {
-  if (PayloadStringToCodecType(settings.payload_name) == kVideoCodecMultiplex) {
+  VideoCodecType codec_type = config.codec_type;
-    VideoSendStream::Config::EncoderSettings associated_codec_settings =
+  // TODO(nisse): Transition hack, the intention is to delete the
-        settings;
+  // |settings| argument and require configuration via
-    associated_codec_settings.payload_name =
+  // config.codec_type.
-        CodecTypeToPayloadString(kVideoCodecVP9);
+  if (codec_type == kVideoCodecUnknown) {
-    if (!SetupCodec(config, associated_codec_settings, streams, nack_enabled,
+    codec_type = PayloadStringToCodecType(settings.payload_name);
-                    codec, bitrate_allocator)) {
+  }
+  if (codec_type == kVideoCodecMultiplex) {
+    VideoEncoderConfig associated_config = config.Copy();
+    associated_config.codec_type = kVideoCodecVP9;
+    if (!SetupCodec(associated_config, settings /* ignored */, streams,
+                    nack_enabled, codec, bitrate_allocator)) {
       RTC_LOG(LS_ERROR) << "Failed to create stereo encoder configuration.";
       return false;
     }
@@ -46,8 +51,7 @@ bool VideoCodecInitializer::SetupCodec(
   }
 
   *codec =
-      VideoEncoderConfigToVideoCodec(config, streams, settings.payload_name,
+      VideoEncoderConfigToVideoCodec(config, streams, codec_type, nack_enabled);
-                                     settings.payload_type, nack_enabled);
   *bitrate_allocator = CreateBitrateAllocator(*codec);
 
   return true;
@@ -73,8 +77,7 @@ VideoCodecInitializer::CreateBitrateAllocator(const VideoCodec& codec) {
 VideoCodec VideoCodecInitializer::VideoEncoderConfigToVideoCodec(
     const VideoEncoderConfig& config,
     const std::vector<VideoStream>& streams,
-    const std::string& payload_name,
+    VideoCodecType codec_type,
-    int payload_type,
     bool nack_enabled) {
   static const int kEncoderMinBitrateKbps = 30;
   RTC_DCHECK(!streams.empty());
@@ -82,7 +85,7 @@ VideoCodec VideoCodecInitializer::VideoEncoderConfigToVideoCodec(
 
   VideoCodec video_codec;
   memset(&video_codec, 0, sizeof(video_codec));
-  video_codec.codecType = PayloadStringToCodecType(payload_name);
+  video_codec.codecType = codec_type;
 
   switch (config.content_type) {
     case VideoEncoderConfig::ContentType::kRealtimeVideo:
@@ -155,7 +158,9 @@ VideoCodec VideoCodecInitializer::VideoEncoderConfigToVideoCodec(
       break;
   }
 
-  video_codec.plType = payload_type;
+  // TODO(nisse): The plType field should be deleted. Luckily, our
+  // callers don't need it.
+  video_codec.plType = 0;
   video_codec.numberOfSimulcastStreams =
       static_cast<unsigned char>(streams.size());
   video_codec.minBitrate = streams[0].min_bitrate_bps / 1000;