commit a1ead6f2ab755e13c97db05134b150771c48bb2a
author Erik Språng <sprang@webrtc.org> Thu Nov 01 16:45:06 2018
committer Commit Bot <commit-bot@chromium.org> Mon Nov 05 11:36:32 2018
tree 05fbdaf54e333c35b44452f42c63a08ef5640487
parent bf0d0c1b3057d4902b8c400def22e2b5f213cb6d

Update EncoderProxy to use EncoderInfo

Bug: webrtc:9890
Change-Id: Iadb9cab3bb628480cb83c456f23cc15f6fee8d47
Reviewed-on: https://webrtc-review.googlesource.com/c/109027
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25497}

test/video_encoder_proxy_factory.h

diff --git a/test/video_encoder_proxy_factory.h b/test/video_encoder_proxy_factory.h
index e7289c0..fa32ebc 100644
--- a/test/video_encoder_proxy_factory.h
+++ b/test/video_encoder_proxy_factory.h
@@ -71,9 +71,6 @@
                        size_t max_payload_size) override {
       return encoder_->InitEncode(config, number_of_cores, max_payload_size);
     }
-    VideoEncoder::ScalingSettings GetScalingSettings() const override {
-      return encoder_->GetScalingSettings();
-    }
     int32_t RegisterEncodeCompleteCallback(
         EncodedImageCallback* callback) override {
       return encoder_->RegisterEncodeCompleteCallback(callback);
@@ -86,8 +83,8 @@
                               uint32_t framerate) override {
       return encoder_->SetRateAllocation(rate_allocation, framerate);
     }
-    const char* ImplementationName() const override {
-      return encoder_->ImplementationName();
+    VideoEncoder::EncoderInfo GetEncoderInfo() const override {
+      return encoder_->GetEncoderInfo();
     }
 
     VideoEncoder* const encoder_;