commit 10608708eba16c7a70a69cd05317cb9766325d81
author Erik Språng <sprang@webrtc.org> Wed Nov 07 15:47:06 2018
committer Commit Bot <commit-bot@chromium.org> Wed Nov 07 17:00:10 2018
tree 224224e91e7547f63207390fae7600a778299edc
parent 727d1649c61282b5f9c5e69a817367ac80208cce

Update LibVpxVp8Encoder to use GetEncoderInfo

Bug: webrtc:9890
Change-Id: I76566bc38137c81b029fa848da89c96454260895
Reviewed-on: https://webrtc-review.googlesource.com/c/109920
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25552}

modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc

diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 6207c36..5d5e20b 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -261,10 +261,6 @@
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-const char* LibvpxVp8Encoder::ImplementationName() const {
-  return "libvpx";
-}
-
 void LibvpxVp8Encoder::SetStreamState(bool send_stream, int stream_idx) {
   if (send_stream && !send_stream_[stream_idx]) {
     // Need a key frame if we have not sent this stream before.
@@ -916,13 +912,20 @@
   return result;
 }
 
-VideoEncoder::ScalingSettings LibvpxVp8Encoder::GetScalingSettings() const {
+VideoEncoder::EncoderInfo LibvpxVp8Encoder::GetEncoderInfo() const {
+  EncoderInfo info;
+  info.supports_native_handle = false;
+  info.implementation_name = "libvpx";
+
   const bool enable_scaling = encoders_.size() == 1 &&
                               configurations_[0].rc_dropframe_thresh > 0 &&
                               codec_.VP8().automaticResizeOn;
-  return enable_scaling ? VideoEncoder::ScalingSettings(kLowVp8QpThreshold,
-                                                        kHighVp8QpThreshold)
-                        : VideoEncoder::ScalingSettings::kOff;
+  info.scaling_settings = enable_scaling
+                              ? VideoEncoder::ScalingSettings(
+                                    kLowVp8QpThreshold, kHighVp8QpThreshold)
+                              : VideoEncoder::ScalingSettings::kOff;
+
+  return info;
 }
 
 int LibvpxVp8Encoder::RegisterEncodeCompleteCallback(

modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h

diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
index 37e3c8d..8a8a12c 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
@@ -50,9 +50,7 @@
   int SetRateAllocation(const VideoBitrateAllocation& bitrate,
                         uint32_t new_framerate) override;
 
-  ScalingSettings GetScalingSettings() const override;
-
-  const char* ImplementationName() const override;
+  EncoderInfo GetEncoderInfo() const override;
 
   static vpx_enc_frame_flags_t EncodeFlags(
       const Vp8TemporalLayers::FrameConfig& references);