From 01b8e5d0f8760832c81fa2fb50afa81305a969fb Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Tue, 28 Aug 2018 09:59:20 +0200 Subject: [PATCH] Remove deprecated VideoEncoder.Settings constructor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9646 Change-Id: Iac14930653969eed4f7b2207149512bb3fb87cee Reviewed-on: https://webrtc-review.googlesource.com/96242 Reviewed-by: Sami Kalliomäki Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#24582} --- sdk/android/api/org/webrtc/VideoEncoder.java | 6 ------ .../src/org/webrtc/HardwareVideoDecoderTest.java | 2 +- .../src/org/webrtc/HardwareVideoEncoderTest.java | 2 +- .../tests/src/org/webrtc/HardwareVideoEncoderTest.java | 1 + 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java index e1984fa83c..8dc7582926 100644 --- a/sdk/android/api/org/webrtc/VideoEncoder.java +++ b/sdk/android/api/org/webrtc/VideoEncoder.java @@ -40,12 +40,6 @@ public interface VideoEncoder { this.numberOfSimulcastStreams = numberOfSimulcastStreams; this.automaticResizeOn = automaticResizeOn; } - - // TODO(http://bugs.webrtc.org/9646): Remove when downstream clients have been updated. - public Settings(int numberOfCores, int width, int height, int startBitrate, int maxFramerate, - boolean automaticResizeOn) { - this(numberOfCores, width, height, startBitrate, maxFramerate, 1, automaticResizeOn); - } } /** Additional info for encoding. */ diff --git a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java index e641aac06c..64a51f50c4 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java @@ -76,7 +76,7 @@ public final class HardwareVideoDecoderTest { private static final boolean ENABLE_H264_HIGH_PROFILE = true; private static final VideoEncoder.Settings ENCODER_SETTINGS = new VideoEncoder.Settings(1 /* core */, TEST_FRAME_WIDTH, TEST_FRAME_HEIGHT, 300 /* kbps */, - 30 /* fps */, true /* automaticResizeOn */); + 30 /* fps */, 1 /* numberOfSimulcastStreams */, true /* automaticResizeOn */); private static final int DECODE_TIMEOUT_MS = 1000; private static final VideoDecoder.Settings SETTINGS = diff --git a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java index 7782fc2647..527ab5ce94 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java @@ -70,7 +70,7 @@ public class HardwareVideoEncoderTest { private static final boolean ENABLE_H264_HIGH_PROFILE = true; private static final VideoEncoder.Settings SETTINGS = new VideoEncoder.Settings(1 /* core */, 640 /* width */, 480 /* height */, 300 /* kbps */, - 30 /* fps */, true /* automaticResizeOn */); + 30 /* fps */, 1 /* numberOfSimulcastStreams */, true /* automaticResizeOn */); private static final int ENCODE_TIMEOUT_MS = 1000; private static final int NUM_TEST_FRAMES = 10; private static final int NUM_ENCODE_TRIES = 100; diff --git a/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java index bf5fcea2bb..336988e0f2 100644 --- a/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java +++ b/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java @@ -57,6 +57,7 @@ public class HardwareVideoEncoderTest { /* height= */ 480, /* startBitrate= */ 10000, /* maxFramerate= */ 30, + /* numberOfSimulcastStreams= */ 1, /* automaticResizeOn= */ true); private static final long POLL_DELAY_MS = 10; private static final long DELIVER_ENCODED_IMAGE_DELAY_MS = 10;