From b03422a7370c3408630d301807aaf290cde75fc5 Mon Sep 17 00:00:00 2001 From: Mirta Dvornicic Date: Mon, 2 Mar 2020 13:10:24 +0100 Subject: [PATCH] Remove deprecated method onEncodingBitrate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11341 Change-Id: Id299d8000fc8e24725aba3e5b261fdd87af2aa86 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169544 Reviewed-by: Sami Kalliomäki Commit-Queue: Mirta Dvornicic Cr-Commit-Position: refs/heads/master@{#30659} --- .../api/org/webrtc/VideoEncoderFactory.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sdk/android/api/org/webrtc/VideoEncoderFactory.java b/sdk/android/api/org/webrtc/VideoEncoderFactory.java index 3c598694be..050aa710ac 100644 --- a/sdk/android/api/org/webrtc/VideoEncoderFactory.java +++ b/sdk/android/api/org/webrtc/VideoEncoderFactory.java @@ -18,28 +18,11 @@ public interface VideoEncoderFactory { /** Called with the VideoCodecInfo of the currently used encoder. */ @CalledByNative("VideoEncoderSelector") void onCurrentEncoder(VideoCodecInfo info); - /** - * Called with the current encoding bitrate. Returns null if the encoder selector prefers to - * keep the current encoder or a VideoCodecInfo if a new encoder is preferred. - * - *

TODO(bugs.webrtc.org/11341): Delete onEncodingBitrate and remove the default - * implementation for onAvailableBitrate once downstream project is updated. - */ - @Deprecated - @Nullable - default VideoCodecInfo onEncodingBitrate(int kbps) { - throw new UnsupportedOperationException("Not implemented."); - } - /** * Called with the current available bitrate. Returns null if the encoder selector prefers to * keep the current encoder or a VideoCodecInfo if a new encoder is preferred. */ - @Nullable - @CalledByNative("VideoEncoderSelector") - default VideoCodecInfo onAvailableBitrate(int kbps) { - return onEncodingBitrate(kbps); - } + @Nullable @CalledByNative("VideoEncoderSelector") VideoCodecInfo onAvailableBitrate(int kbps); /** * Called when the currently used encoder signal itself as broken. Returns null if the encoder