Update H264 encoder to use GetEncoderInfo
Bug: webrtc:9890
Change-Id: I952b979346d97c42a4f60e9e2b091da563dfffab
Reviewed-on: https://webrtc-review.googlesource.com/c/109921
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25553}diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index e66ab9c..f191f2c 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 @@
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 @@
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 f6f7df0..da32563 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 @@
const CodecSpecificInfo* codec_specific_info,
const std::vector<FrameType>* frame_types) override;
- const char* ImplementationName() const override;
-
- VideoEncoder::ScalingSettings GetScalingSettings() const override;
+ EncoderInfo GetEncoderInfo() const override;
// Exposed for testing.
H264PacketizationMode PacketizationModeForTesting() const {