From 5486bcd0d0e475f8ccd7a5adb33d4569367c1136 Mon Sep 17 00:00:00 2001 From: philipel Date: Wed, 7 Nov 2018 13:17:24 +0100 Subject: [PATCH] Remove SetChannelParameters function from API classes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to https://webrtc-review.googlesource.com/c/src/+/108861 Bug: webrtc:9946 Change-Id: Ia6e7fa3942c21aefeadb7b214c85cff93fbc2ef6 Reviewed-on: https://webrtc-review.googlesource.com/c/109860 Reviewed-by: Niels Moller Reviewed-by: Sami Kalliomäki Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/master@{#25747} --- api/video_codecs/video_encoder.cc | 4 ---- api/video_codecs/video_encoder.h | 11 ----------- sdk/android/api/org/webrtc/VideoEncoder.java | 13 ------------- 3 files changed, 28 deletions(-) diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index 363edbfd2f..135687c970 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc @@ -123,8 +123,4 @@ VideoEncoder::EncoderInfo VideoEncoder::GetEncoderInfo() const { info.implementation_name = ImplementationName(); return info; } - -int32_t VideoEncoder::SetChannelParameters(uint32_t packet_loss, int64_t rtt) { - return 0; -} } // namespace webrtc diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index d881f8ac64..e7deb7dbb9 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h @@ -202,17 +202,6 @@ class RTC_EXPORT VideoEncoder { const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) = 0; - // Inform the encoder of the new packet loss rate and the round-trip time of - // the network. - // - // Input: - // - packet_loss : Fraction lost - // (loss rate in percent = 100 * packetLoss / 255) - // - rtt : Round-trip time in milliseconds - // Return value : WEBRTC_VIDEO_CODEC_OK if OK - // <0 - Errors: WEBRTC_VIDEO_CODEC_ERROR - virtual int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt); - // Inform the encoder about the new target bit rate. // // Input: diff --git a/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java index beb47dff35..afc5cd0239 100644 --- a/sdk/android/api/org/webrtc/VideoEncoder.java +++ b/sdk/android/api/org/webrtc/VideoEncoder.java @@ -210,19 +210,6 @@ public interface VideoEncoder { */ @CalledByNative VideoCodecStatus encode(VideoFrame frame, EncodeInfo info); - /** - * Informs the encoder of the packet loss and the round-trip time of the network. - * - * @param packetLoss How many packets are lost on average per 255 packets. - * @param roundTripTimeMs Round-trip time of the network in milliseconds. - */ - // TODO(webrtc:9946): Remove this function when downstream projects have been - // updated. - @Deprecated - default VideoCodecStatus setChannelParameters(short packetLoss, long roundTripTimeMs) { - return VideoCodecStatus.OK; - } - /** Sets the bitrate allocation and the target framerate for the encoder. */ @CalledByNative VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate);