From 54b4924349c2779aa4f515c347b9448bba1f4b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Wed, 7 Nov 2018 16:50:28 +0100 Subject: [PATCH] Update H264 encoder to use GetEncoderInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9890 Change-Id: I952b979346d97c42a4f60e9e2b091da563dfffab Reviewed-on: https://webrtc-review.googlesource.com/c/109921 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#25553} --- .../video_coding/codecs/h264/h264_encoder_impl.cc | 14 +++++++------- .../video_coding/codecs/h264/h264_encoder_impl.h | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc index e66ab9cc74..f191f2c640 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -535,10 +535,6 @@ int32_t H264EncoderImpl::Encode(const VideoFrame& input_frame, return WEBRTC_VIDEO_CODEC_OK; } -const char* H264EncoderImpl::ImplementationName() const { - return "OpenH264"; -} - // Initialization parameters. // There are two ways to initialize. There is SEncParamBase (cleared with // memset(&p, 0, sizeof(SEncParamBase)) used in Initialize, and SEncParamExt @@ -625,9 +621,13 @@ void H264EncoderImpl::ReportError() { has_reported_error_ = true; } -VideoEncoder::ScalingSettings H264EncoderImpl::GetScalingSettings() const { - return VideoEncoder::ScalingSettings(kLowH264QpThreshold, - kHighH264QpThreshold); +VideoEncoder::EncoderInfo H264EncoderImpl::GetEncoderInfo() const { + EncoderInfo info; + info.supports_native_handle = false; + info.implementation_name = "OpenH264"; + info.scaling_settings = + VideoEncoder::ScalingSettings(kLowH264QpThreshold, kHighH264QpThreshold); + return info; } void H264EncoderImpl::LayerConfig::SetStreamState(bool send_stream) { diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.h b/modules/video_coding/codecs/h264/h264_encoder_impl.h index f6f7df0cab..da32563c9b 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.h +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.h @@ -70,9 +70,7 @@ class H264EncoderImpl : public H264Encoder { const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; - const char* ImplementationName() const override; - - VideoEncoder::ScalingSettings GetScalingSettings() const override; + EncoderInfo GetEncoderInfo() const override; // Exposed for testing. H264PacketizationMode PacketizationModeForTesting() const {