From ecd21b481fc2f01b19044b23856ef6b95826f237 Mon Sep 17 00:00:00 2001 From: pbos Date: Thu, 7 Jan 2016 08:03:05 -0800 Subject: Add ImplementationName to SimulcastEncoderAdapter. BUG=webrtc:4897 R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1555673002 Cr-Commit-Position: refs/heads/master@{#11170} --- .../modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc | 7 +++++++ webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h | 1 + 2 files changed, 8 insertions(+) (limited to 'webrtc/modules') diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc index 6abb435441..40e438f7e4 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc @@ -496,4 +496,11 @@ bool SimulcastEncoderAdapter::SupportsNativeHandle() const { return streaminfos_[0].encoder->SupportsNativeHandle(); } +const char* SimulcastEncoderAdapter::ImplementationName() const { + // We should not be calling this method before streaminfos_ are configured. + RTC_DCHECK(!streaminfos_.empty()); + // TODO(pbos): Support multiple implementation names for different encoders. + return streaminfos_[0].encoder->ImplementationName(); +} + } // namespace webrtc diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h index c3bf4cf75a..05a96c7336 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h @@ -59,6 +59,7 @@ class SimulcastEncoderAdapter : public VP8Encoder { int GetTargetFramerate() override; bool SupportsNativeHandle() const override; + const char* ImplementationName() const override; private: struct StreamInfo { -- cgit v1.2.3