Removing VCMCodecDataBase::Codec and VideoCodingModule::Codec.

webrtc/api/video_codecs/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.
  */
 
@@ skipping 23 matching lines @@
   virtual ~EncodedImageCallback() {}
 
   struct Result {
     enum Error {
       OK,
 
       // Failed to send the packet.
       ERROR_SEND_FAILED,
     };
 
-    Result(Error error) : error(error) {}
+    explicit Result(Error error) : error(error) {}
     Result(Error error, uint32_t frame_id) : error(error), frame_id(frame_id) {}
 
     Error error;
 
     // Frame ID assigned to the frame. The frame ID should be the same as the ID
     // seen by the receiver for this frame. RTP timestamp of the frame is used
     // as frame ID when RTP is used to send video. Must be used only when
     // error=OK.
     uint32_t frame_id = 0;
 
@@ skipping 12 matching lines @@
 
 class VideoEncoder {
  public:
   struct QpThresholds {
     QpThresholds(int l, int h) : low(l), high(h) {}
     QpThresholds() : low(-1), high(-1) {}
     int low;
     int high;
   };
   struct ScalingSettings {
-    ScalingSettings(bool on, int low, int high)
-        : enabled(on),
-          thresholds(rtc::Optional<QpThresholds>(QpThresholds(low, high))) {}
-    explicit ScalingSettings(bool on) : enabled(on) {}
+    ScalingSettings(bool on, int low, int high);
+    explicit ScalingSettings(bool on);
+    ScalingSettings(const ScalingSettings&);
+    ~ScalingSettings();
+
     const bool enabled;
     const rtc::Optional<QpThresholds> thresholds;
   };
 
   static VideoCodecVP8 GetDefaultVp8Settings();
   static VideoCodecVP9 GetDefaultVp9Settings();
   static VideoCodecH264 GetDefaultH264Settings();
 
   virtual ~VideoEncoder() {}
 
@@ skipping 57 matching lines @@
   //                          <0 - Errors: WEBRTC_VIDEO_CODEC_ERROR
   virtual int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) = 0;
 
   // Inform the encoder about the new target bit rate.
   //
   // Input:
   //          - bitrate         : New target bit rate
   //          - framerate       : The target frame rate
   //
   // Return value                : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual int32_t SetRates(uint32_t bitrate, uint32_t framerate) {
-    RTC_NOTREACHED() << "SetRate(uint32_t, uint32_t) is deprecated.";
-    return -1;
-  }
+  virtual int32_t SetRates(uint32_t bitrate, uint32_t framerate);

[brandtr, 2017/08/10 08:05:35]

Does it make sense to make it RTC_DEPRECATED?

[mflodman, 2017/08/10 08:23:56]

Yes, done.

 
   // Default fallback: Just use the sum of bitrates as the single target rate.
   // TODO(sprang): Remove this default implementation when we remove SetRates().
   virtual int32_t SetRateAllocation(const BitrateAllocation& allocation,
-                                    uint32_t framerate) {
-    return SetRates(allocation.get_sum_kbps(), framerate);
-  }
+                                    uint32_t framerate);
 
   // Any encoder implementation wishing to use the WebRTC provided
   // quality scaler must implement this method.
-  virtual ScalingSettings GetScalingSettings() const {
-    return ScalingSettings(false);
-  }
+  virtual ScalingSettings GetScalingSettings() const;
 
-  virtual int32_t SetPeriodicKeyFrames(bool enable) { return -1; }
-  virtual bool SupportsNativeHandle() const { return false; }
-  virtual const char* ImplementationName() const { return "unknown"; }
+  virtual int32_t SetPeriodicKeyFrames(bool enable);
+  virtual bool SupportsNativeHandle() const;
+  virtual const char* ImplementationName() const;
 };
-
 }  // namespace webrtc
 #endif  // WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_H_