From 6ed4f14418b03c391bdd24faf41f97ee21ce1afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= <sprang@webrtc.org>
Date: Mon, 26 Nov 2018 13:42:39 +0100
Subject: [PATCH] Remove deprecated VideoEncoder metadata methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:9890
Change-Id: Ie54fdb2727c49abbaab32848c6eeffc9d04a9229
Reviewed-on: https://webrtc-review.googlesource.com/c/111182
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25857}
---
 api/video_codecs/video_encoder.cc             | 22 +++----------------
 api/video_codecs/video_encoder.h              |  6 -----
 .../include/video_codec_interface.h           |  4 +---
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index 2ba14c9233..6c6374b055 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -106,25 +106,9 @@ int32_t VideoEncoder::SetRateAllocation(
   return SetRates(allocation.get_sum_kbps(), framerate);
 }
 
-VideoEncoder::ScalingSettings VideoEncoder::GetScalingSettings() const {
-  return ScalingSettings::kOff;
-}
-
-bool VideoEncoder::SupportsNativeHandle() const {
-  return false;
-}
-
-const char* VideoEncoder::ImplementationName() const {
-  return "unknown";
-}
-
-// TODO(webrtc:9722): Remove and make pure virtual when the three legacy
-// methods called here are gone.
+// TODO(webrtc:9722): Remove and make pure virtual.
 VideoEncoder::EncoderInfo VideoEncoder::GetEncoderInfo() const {
-  EncoderInfo info;
-  info.scaling_settings = GetScalingSettings();
-  info.supports_native_handle = SupportsNativeHandle();
-  info.implementation_name = ImplementationName();
-  return info;
+  return EncoderInfo();
 }
+
 }  // namespace webrtc
diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h
index 515fec82ae..da21fa65a2 100644
--- a/api/video_codecs/video_encoder.h
+++ b/api/video_codecs/video_encoder.h
@@ -229,12 +229,6 @@ class RTC_EXPORT VideoEncoder {
   virtual int32_t SetRateAllocation(const VideoBitrateAllocation& allocation,
                                     uint32_t framerate);
 
-  // GetScalingSettings(), SupportsNativeHandle(), ImplementationName() are
-  // deprecated, use GetEncoderInfo() instead.
-  virtual ScalingSettings GetScalingSettings() const;
-  virtual bool SupportsNativeHandle() const;
-  virtual const char* ImplementationName() const;
-
   // Returns meta-data about the encoder, such as implementation name.
   // The output of this method may change during runtime. For instance if a
   // hardware encoder fails, it may fall back to doing software encoding using
diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h
index 38583bfa3b..d6e696df05 100644
--- a/modules/video_coding/include/video_codec_interface.h
+++ b/modules/video_coding/include/video_codec_interface.h
@@ -75,12 +75,10 @@ union CodecSpecificInfoUnion {
 // must be fitted with a copy-constructor. This is because it is copied
 // in the copy-constructor of VCMEncodedFrame.
 struct CodecSpecificInfo {
-  CodecSpecificInfo() : codecType(kVideoCodecGeneric), codec_name(nullptr) {
+  CodecSpecificInfo() : codecType(kVideoCodecGeneric) {
     memset(&codecSpecific, 0, sizeof(codecSpecific));
   }
   VideoCodecType codecType;
-  // |codec_name| is deprecated, use name provided by VideoEncoder instead.
-  const char* codec_name;
   CodecSpecificInfoUnion codecSpecific;
 };