mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 00:57:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecated VideoEncoder.Settings constructor.

Browse source 
Bug: webrtc:9646
Change-Id: Iac14930653969eed4f7b2207149512bb3fb87cee
Reviewed-on: https://webrtc-review.googlesource.com/96242
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24582}
This commit is contained in:
Rasmus Brandt 2018-08-28 09:59:20 +02:00 committed by Commit Bot
parent 4a02b67ac3
commit 01b8e5d0f8
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sdk/android/api/org/webrtc/VideoEncoder.java
View file

@ -40,12 +40,6 @@ public interface VideoEncoder {
this.numberOfSimulcastStreams = numberOfSimulcastStreams; this.numberOfSimulcastStreams = numberOfSimulcastStreams;
this.automaticResizeOn = automaticResizeOn; 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. */ /** Additional info for encoding. */

2
sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java
View file

@ -76,7 +76,7 @@ public final class HardwareVideoDecoderTest {
private static final boolean ENABLE_H264_HIGH_PROFILE = true; private static final boolean ENABLE_H264_HIGH_PROFILE = true;
private static final VideoEncoder.Settings ENCODER_SETTINGS = private static final VideoEncoder.Settings ENCODER_SETTINGS =
new VideoEncoder.Settings(1 /* core */, TEST_FRAME_WIDTH, TEST_FRAME_HEIGHT, 300 /* kbps */, 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 int DECODE_TIMEOUT_MS = 1000;
private static final VideoDecoder.Settings SETTINGS = private static final VideoDecoder.Settings SETTINGS =

2
sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
View file

@ -70,7 +70,7 @@ public class HardwareVideoEncoderTest {
private static final boolean ENABLE_H264_HIGH_PROFILE = true; private static final boolean ENABLE_H264_HIGH_PROFILE = true;
private static final VideoEncoder.Settings SETTINGS = private static final VideoEncoder.Settings SETTINGS =
new VideoEncoder.Settings(1 /* core */, 640 /* width */, 480 /* height */, 300 /* kbps */, 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 ENCODE_TIMEOUT_MS = 1000;
private static final int NUM_TEST_FRAMES = 10; private static final int NUM_TEST_FRAMES = 10;
private static final int NUM_ENCODE_TRIES = 100; private static final int NUM_ENCODE_TRIES = 100;

1
sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java
View file

@ -57,6 +57,7 @@ public class HardwareVideoEncoderTest {
/* height= */ 480, /* height= */ 480,
/* startBitrate= */ 10000, /* startBitrate= */ 10000,
/* maxFramerate= */ 30, /* maxFramerate= */ 30,
/* numberOfSimulcastStreams= */ 1,
/* automaticResizeOn= */ true); /* automaticResizeOn= */ true);
private static final long POLL_DELAY_MS = 10; private static final long POLL_DELAY_MS = 10;
private static final long DELIVER_ENCODED_IMAGE_DELAY_MS = 10; private static final long DELIVER_ENCODED_IMAGE_DELAY_MS = 10;