Pass selected cricket::VideoCodec down to internal H264 encoder

webrtc/video_encoder.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_VIDEO_ENCODER_H_
 #define WEBRTC_VIDEO_ENCODER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/common_types.h"
+#include "webrtc/media/base/codec.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_frame.h"
 
 namespace webrtc {
 
 class RTPFragmentationHeader;
 // TODO(pbos): Expose these through a public (root) header or change these APIs.
 struct CodecSpecificInfo;
 class VideoCodec;
 
@@ skipping 39 matching lines @@
                           const CodecSpecificInfo* codec_specific_info,
                           const RTPFragmentationHeader* fragmentation) {
     Result result =
         OnEncodedImage(encoded_image, codec_specific_info, fragmentation);
     return (result.error != Result::OK) ? -1 : (result.drop_next_frame ? 1 : 0);
   }
 };
 
 class VideoEncoder {
  public:
-  enum EncoderType {
-    kH264,
-    kVp8,
-    kVp9,
-    kUnsupportedCodec,
-  };
-
-  static VideoEncoder* Create(EncoderType codec_type);
+  static VideoEncoder* Create(const cricket::VideoCodec& codec);
   // Returns true if this type of encoder can be created using
   // VideoEncoder::Create.
-  static bool IsSupportedSoftware(EncoderType codec_type);
-  static EncoderType CodecToEncoderType(VideoCodecType codec_type);
+  static bool IsSupportedSoftware(const cricket::VideoCodec& codec);
 
   static VideoCodecVP8 GetDefaultVp8Settings();
   static VideoCodecVP9 GetDefaultVp9Settings();
   static VideoCodecH264 GetDefaultH264Settings();
 
   virtual ~VideoEncoder() {}
 
   // Initialize the encoder with the information from the codecSettings
   //
   // Input:
@@ skipping 67 matching lines @@
   virtual void OnDroppedFrame() {}
   virtual bool SupportsNativeHandle() const { return false; }
   virtual const char* ImplementationName() const { return "unknown"; }
 };
 
 // Class used to wrap external VideoEncoders to provide a fallback option on
 // software encoding when a hardware encoder fails to encode a stream due to
 // hardware restrictions, such as max resolution.
 class VideoEncoderSoftwareFallbackWrapper : public VideoEncoder {
  public:
-  VideoEncoderSoftwareFallbackWrapper(VideoCodecType codec_type,
+  VideoEncoderSoftwareFallbackWrapper(const cricket::VideoCodec& codec,
                                       webrtc::VideoEncoder* encoder);
 
   int32_t InitEncode(const VideoCodec* codec_settings,
                      int32_t number_of_cores,
                      size_t max_payload_size) override;
 
   int32_t RegisterEncodeCompleteCallback(
       EncodedImageCallback* callback) override;
 
   int32_t Release() override;
@@ skipping 18 matching lines @@
   // The last bitrate/framerate set, and a flag for noting they are set.
   bool rates_set_;
   uint32_t bitrate_;
   uint32_t framerate_;
 
   // The last channel parameters set, and a flag for noting they are set.
   bool channel_parameters_set_;
   uint32_t packet_loss_;
   int64_t rtt_;
 
-  const EncoderType encoder_type_;
+  const cricket::VideoCodec codec_;
   webrtc::VideoEncoder* const encoder_;
 
   std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
   std::string fallback_implementation_name_;
   EncodedImageCallback* callback_;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_ENCODER_H_