From 727d1649c61282b5f9c5e69a817367ac80208cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Wed, 7 Nov 2018 16:54:15 +0100 Subject: [PATCH] Update VP9 encoder to use GetEncoderInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9890 Change-Id: I74c1e098c800a44e2e038cd8a01be6c61bec97f5 Reviewed-on: https://webrtc-review.googlesource.com/c/109922 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#25551} --- modules/video_coding/codecs/vp9/vp9_impl.cc | 8 ++++++-- modules/video_coding/codecs/vp9/vp9_impl.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index 190735a518..da9633d2f1 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -1245,8 +1245,12 @@ int VP9EncoderImpl::RegisterEncodeCompleteCallback( return WEBRTC_VIDEO_CODEC_OK; } -const char* VP9EncoderImpl::ImplementationName() const { - return "libvpx"; +VideoEncoder::EncoderInfo VP9EncoderImpl::GetEncoderInfo() const { + EncoderInfo info; + info.supports_native_handle = false; + info.implementation_name = "libvpx"; + info.scaling_settings = VideoEncoder::ScalingSettings::kOff; + return info; } std::unique_ptr VP9Decoder::Create() { diff --git a/modules/video_coding/codecs/vp9/vp9_impl.h b/modules/video_coding/codecs/vp9/vp9_impl.h index f0686b4077..3418fe37a6 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.h +++ b/modules/video_coding/codecs/vp9/vp9_impl.h @@ -49,7 +49,7 @@ class VP9EncoderImpl : public VP9Encoder { int SetRateAllocation(const VideoBitrateAllocation& bitrate_allocation, uint32_t frame_rate) override; - const char* ImplementationName() const override; + EncoderInfo GetEncoderInfo() const override; private: // Determine number of encoder threads to use.