From 535dbd3fb822ce5f3803e1008a9a84158487cfa7 Mon Sep 17 00:00:00 2001 From: kthelgason Date: Thu, 26 Jan 2017 00:36:31 -0800 Subject: [PATCH] add ImplementationName for VideoEncoderSoftwareFallbackWrapper. BUG=None Review-Url: https://codereview.webrtc.org/2651033005 Cr-Commit-Position: refs/heads/master@{#16283} --- webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc | 6 ++++++ webrtc/media/engine/videoencodersoftwarefallbackwrapper.h | 1 + 2 files changed, 7 insertions(+) diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc index a4d865e80d..301533b66f 100644 --- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc +++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc @@ -170,4 +170,10 @@ VideoEncoderSoftwareFallbackWrapper::GetScalingSettings() const { return encoder_->GetScalingSettings(); } +const char *VideoEncoderSoftwareFallbackWrapper::ImplementationName() const { + if (fallback_encoder_) + return fallback_encoder_->ImplementationName(); + return encoder_->ImplementationName(); +} + } // namespace webrtc diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.h b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.h index 3d53090a27..055dd2957a 100644 --- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.h +++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.h @@ -44,6 +44,7 @@ class VideoEncoderSoftwareFallbackWrapper : public VideoEncoder { uint32_t framerate) override; bool SupportsNativeHandle() const override; ScalingSettings GetScalingSettings() const override; + const char *ImplementationName() const override; private: bool InitFallbackEncoder();