diff options
| author | pbos <pbos@webrtc.org> | 2016-01-07 08:03:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-07 16:03:13 +0000 |
| commit | ecd21b481fc2f01b19044b23856ef6b95826f237 (patch) | |
| tree | 0d2729abbd4d67a5fe5697a19618b2ecafc3a32c | |
| parent | 01f364ef06cc8b1e7c64cc8038d6cb0e872384f3 (diff) | |
| download | webrtc-ecd21b481fc2f01b19044b23856ef6b95826f237.tar.gz | |
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}
| -rw-r--r-- | webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc | 7 | ||||
| -rw-r--r-- | webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h | 1 |
2 files changed, 8 insertions, 0 deletions
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 { |