Pass selected cricket::VideoCodec down to internal H264 encoder

webrtc/video/video_encoder.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.
  */
 
 #include "webrtc/video_encoder.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
 
 namespace webrtc {
-VideoEncoder* VideoEncoder::Create(VideoEncoder::EncoderType codec_type) {
-  RTC_DCHECK(IsSupportedSoftware(codec_type));
-  switch (codec_type) {
-    case kH264:
-      return H264Encoder::Create();
-    case kVp8:
+VideoEncoder* VideoEncoder::Create(const cricket::VideoCodec& codec) {
+  RTC_DCHECK(IsSupportedSoftware(codec));
+  switch (cricket::CodecTypeFromName(codec.name)) {
+    case kVideoCodecH264:
+      return H264Encoder::Create(codec);
+    case kVideoCodecVP8:
       return VP8Encoder::Create();
-    case kVp9:
+    case kVideoCodecVP9:
       return VP9Encoder::Create();
-    case kUnsupportedCodec:
+    default:
       RTC_NOTREACHED();
       return nullptr;
   }
-  RTC_NOTREACHED();
-  return nullptr;
 }
 
-bool VideoEncoder::IsSupportedSoftware(EncoderType codec_type) {
-  switch (codec_type) {
-    case kH264:
+bool VideoEncoder::IsSupportedSoftware(const cricket::VideoCodec& codec) {
+  switch (cricket::CodecTypeFromName(codec.name)) {
+    case kVideoCodecH264:
       return H264Encoder::IsSupported();
-    case kVp8:
+    case kVideoCodecVP8:
       return true;
-    case kVp9:
+    case kVideoCodecVP9:
       return VP9Encoder::IsSupported();
-    case kUnsupportedCodec:
-      RTC_NOTREACHED();
+    default:
       return false;
   }
-  RTC_NOTREACHED();
-  return false;
-}
-
-VideoEncoder::EncoderType VideoEncoder::CodecToEncoderType(
-    VideoCodecType codec_type) {
-  switch (codec_type) {
-    case kVideoCodecH264:
-      return VideoEncoder::kH264;
-    case kVideoCodecVP8:
-      return VideoEncoder::kVp8;
-    case kVideoCodecVP9:
-      return VideoEncoder::kVp9;
-    default:
-      return VideoEncoder::kUnsupportedCodec;
-  }
 }
 
 VideoEncoderSoftwareFallbackWrapper::VideoEncoderSoftwareFallbackWrapper(
-    VideoCodecType codec_type,
+    const cricket::VideoCodec& codec,
     webrtc::VideoEncoder* encoder)
     : rates_set_(false),
       channel_parameters_set_(false),
-      encoder_type_(CodecToEncoderType(codec_type)),
+      codec_(codec),
       encoder_(encoder),
       callback_(nullptr) {}
 
 bool VideoEncoderSoftwareFallbackWrapper::InitFallbackEncoder() {
-  if (!VideoEncoder::IsSupportedSoftware(encoder_type_)) {
+  if (!VideoEncoder::IsSupportedSoftware(codec_)) {
     LOG(LS_WARNING)
         << "Encoder requesting fallback to codec not supported in software.";
     return false;
   }
-  fallback_encoder_.reset(VideoEncoder::Create(encoder_type_));
+  fallback_encoder_.reset(VideoEncoder::Create(codec_));
   if (fallback_encoder_->InitEncode(&codec_settings_, number_of_cores_,
                                     max_payload_size_) !=
       WEBRTC_VIDEO_CODEC_OK) {
     LOG(LS_ERROR) << "Failed to initialize software-encoder fallback.";
     fallback_encoder_->Release();
     fallback_encoder_.reset();
     return false;
   }
   // Replay callback, rates, and channel parameters.
   if (callback_)
@@ skipping 21 matching lines @@
   // encoder after a failed Encode call.
   codec_settings_ = *codec_settings;
   number_of_cores_ = number_of_cores;
   max_payload_size_ = max_payload_size;
   // Clear stored rate/channel parameters.
   rates_set_ = false;
   channel_parameters_set_ = false;
 
   int32_t ret =
       encoder_->InitEncode(codec_settings, number_of_cores, max_payload_size);
-  if (ret == WEBRTC_VIDEO_CODEC_OK || encoder_type_ == kUnsupportedCodec) {
+  if (ret == WEBRTC_VIDEO_CODEC_OK || codec_.name.empty()) {
     if (fallback_encoder_)
       fallback_encoder_->Release();
     fallback_encoder_.reset();
     if (callback_)
       encoder_->RegisterEncodeCompleteCallback(callback_);
     return ret;
   }
   // Try to instantiate software codec.
   if (InitFallbackEncoder()) {
     return WEBRTC_VIDEO_CODEC_OK;
@@ skipping 71 matching lines @@
   return encoder_->OnDroppedFrame();
 }
 
 bool VideoEncoderSoftwareFallbackWrapper::SupportsNativeHandle() const {
   if (fallback_encoder_)
     return fallback_encoder_->SupportsNativeHandle();
   return encoder_->SupportsNativeHandle();
 }
 
 }  // namespace webrtc