From 7553c02b1e32ded251d7be828d8b75526bdfd45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Mon, 5 Nov 2018 14:57:59 +0100 Subject: [PATCH] Update ObjCVideoEncoder to use GetEncoderInfo() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This method replaces GetScalingSettings(), GetImpementationName() and SupportsNativeHandle(). Bug: webrtc:9890 Change-Id: I8a4b13414f66c41f6697ed84854424ab2d8e18e4 Reviewed-on: https://webrtc-review.googlesource.com/c/109460 Reviewed-by: Kári Helgason Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#25538} --- sdk/objc/native/src/objc_video_encoder_factory.mm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm index 68e8133564..fafad7466e 100644 --- a/sdk/objc/native/src/objc_video_encoder_factory.mm +++ b/sdk/objc/native/src/objc_video_encoder_factory.mm @@ -90,16 +90,17 @@ class ObjCVideoEncoder : public VideoEncoder { return [encoder_ setBitrate:bitrate framerate:framerate]; } - bool SupportsNativeHandle() const { return true; } + VideoEncoder::EncoderInfo GetEncoderInfo() const { + EncoderInfo info; + info.supports_native_handle = true; + info.implementation_name = implementation_name_; - VideoEncoder::ScalingSettings GetScalingSettings() const { RTCVideoEncoderQpThresholds *qp_thresholds = [encoder_ scalingSettings]; - return qp_thresholds ? ScalingSettings(qp_thresholds.low, qp_thresholds.high) : - ScalingSettings::kOff; + info.scaling_settings = qp_thresholds ? ScalingSettings(qp_thresholds.low, qp_thresholds.high) : + ScalingSettings::kOff; + return info; } - const char *ImplementationName() const { return implementation_name_.c_str(); } - private: id encoder_; const std::string implementation_name_;