From 449afd937435686481598b61b207e2e3691693ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 1 Nov 2018 14:44:19 +0100 Subject: [PATCH] Updated ScopedVideoEncoder to use GetEncoderInfo() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9890 Change-Id: Icca1cc1df6a227a30a5f54228fa33a9e63e702e0 Reviewed-on: https://webrtc-review.googlesource.com/c/109007 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#25471} --- media/engine/scopedvideoencoder.cc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/media/engine/scopedvideoencoder.cc b/media/engine/scopedvideoencoder.cc index 026654e072..288a378e0b 100644 --- a/media/engine/scopedvideoencoder.cc +++ b/media/engine/scopedvideoencoder.cc @@ -37,10 +37,7 @@ class ScopedVideoEncoder : public webrtc::VideoEncoder { int32_t SetRates(uint32_t bitrate, uint32_t framerate) override; int32_t SetRateAllocation(const webrtc::VideoBitrateAllocation& allocation, uint32_t framerate) override; - ScalingSettings GetScalingSettings() const override; - bool SupportsNativeHandle() const override; - const char* ImplementationName() const override; - + EncoderInfo GetEncoderInfo() const override; ~ScopedVideoEncoder() override; private: @@ -90,17 +87,8 @@ int32_t ScopedVideoEncoder::SetRateAllocation( return encoder_->SetRateAllocation(allocation, framerate); } -webrtc::VideoEncoder::ScalingSettings ScopedVideoEncoder::GetScalingSettings() - const { - return encoder_->GetScalingSettings(); -} - -bool ScopedVideoEncoder::SupportsNativeHandle() const { - return encoder_->SupportsNativeHandle(); -} - -const char* ScopedVideoEncoder::ImplementationName() const { - return encoder_->ImplementationName(); +webrtc::VideoEncoder::EncoderInfo ScopedVideoEncoder::GetEncoderInfo() const { + return encoder_->GetEncoderInfo(); } ScopedVideoEncoder::~ScopedVideoEncoder() {