From a1ead6f2ab755e13c97db05134b150771c48bb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 1 Nov 2018 17:45:06 +0100 Subject: [PATCH] Update EncoderProxy to use EncoderInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9890 Change-Id: Iadb9cab3bb628480cb83c456f23cc15f6fee8d47 Reviewed-on: https://webrtc-review.googlesource.com/c/109027 Reviewed-by: Niels Moller Reviewed-by: Sebastian Jansson Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#25497} --- test/video_encoder_proxy_factory.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/video_encoder_proxy_factory.h b/test/video_encoder_proxy_factory.h index e7289c0399..fa32ebc065 100644 --- a/test/video_encoder_proxy_factory.h +++ b/test/video_encoder_proxy_factory.h @@ -71,9 +71,6 @@ class VideoEncoderProxyFactory final : public VideoEncoderFactory { 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 @@ class VideoEncoderProxyFactory final : public VideoEncoderFactory { 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_;