From 9828bebee69be2aabab7bcf0cffbfbc67edaf5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Thu, 26 Oct 2017 16:21:22 +0200 Subject: [PATCH] Fix/suppress all javac warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is done in preparation to make all javac warnings into errors for WebRTC targets. Bug: webrtc:6597 Change-Id: I402043157bd75943adf0de52111e5a1bb179c6d1 Reviewed-on: https://webrtc-review.googlesource.com/15104 Commit-Queue: Sami Kalliomäki Reviewed-by: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#20450} --- .../appspot/apprtc/AppRTCAudioManager.java | 9 ++-- .../appspot/apprtc/PeerConnectionClient.java | 1 + .../apprtc/test/PeerConnectionClientTest.java | 43 +++++++++++++------ rtc_base/java/src/org/webrtc/ThreadUtils.java | 2 + sdk/android/api/org/webrtc/GlRectDrawer.java | 6 +-- .../org/webrtc/MediaCodecVideoDecoder.java | 2 +- .../api/org/webrtc/PeerConnection.java | 2 +- .../api/org/webrtc/VideoFileRenderer.java | 3 ++ .../Camera1CapturerUsingByteBufferTest.java | 3 -- .../Camera1CapturerUsingTextureTest.java | 3 -- .../src/org/webrtc/Camera2CapturerTest.java | 3 -- .../CameraVideoCapturerTestFixtures.java | 32 ++++++++++---- .../src/org/webrtc/EglRendererTest.java | 14 ++++-- .../org/webrtc/HardwareVideoEncoderTest.java | 2 +- .../src/org/webrtc/NetworkMonitorTest.java | 2 +- .../src/org/webrtc/PeerConnectionTest.java | 31 +++++++++---- .../src/org/webrtc/WebRtcJniBootTest.java | 5 ++- .../java/org/webrtc/HardwareVideoDecoder.java | 2 +- 18 files changed, 106 insertions(+), 59 deletions(-) diff --git a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java index f8d60dd7c1..ee0858639b 100644 --- a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java +++ b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java @@ -10,8 +10,6 @@ package org.appspot.apprtc; -import org.appspot.apprtc.util.AppRTCUtils; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -23,12 +21,11 @@ import android.media.AudioManager; import android.os.Build; import android.preference.PreferenceManager; import android.util.Log; - -import org.webrtc.ThreadUtils; - import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.appspot.apprtc.util.AppRTCUtils; +import org.webrtc.ThreadUtils; /** * AppRTCAudioManager manages all audio related parts of the AppRTC demo. @@ -195,6 +192,7 @@ public class AppRTCAudioManager { AppRTCUtils.logDeviceInfo(TAG); } + @SuppressWarnings("deprecation") // TODO(henrika): audioManager.requestAudioFocus() is deprecated. public void start(AudioManagerEvents audioManagerEvents) { Log.d(TAG, "start"); ThreadUtils.checkIsOnMainThread(); @@ -292,6 +290,7 @@ public class AppRTCAudioManager { Log.d(TAG, "AudioManager started"); } + @SuppressWarnings("deprecation") // TODO(henrika): audioManager.abandonAudioFocus() is deprecated. public void stop() { Log.d(TAG, "stop"); ThreadUtils.checkIsOnMainThread(); diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 5d334b71a3..7d30ae66ed 100644 --- a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -725,6 +725,7 @@ public class PeerConnectionClient { return rootEglBase.getEglBaseContext(); } + @SuppressWarnings("deprecation") // TODO(sakal): getStats is deprecated. private void getStats() { if (peerConnection == null || isError) { return; diff --git a/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java index aa125cf7d9..3c64b3022b 100644 --- a/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java +++ b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java @@ -243,41 +243,58 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { // Helper wait functions. private boolean waitForLocalSDP(int timeoutMs) throws InterruptedException { synchronized (localSdpEvent) { - if (localSdp == null) { - localSdpEvent.wait(timeoutMs); + final long endTimeMs = System.currentTimeMillis() + timeoutMs; + while (localSdp == null) { + final long waitTimeMs = endTimeMs - System.currentTimeMillis(); + if (waitTimeMs < 0) { + return false; + } + localSdpEvent.wait(waitTimeMs); } - return (localSdp != null); + return true; } } private boolean waitForIceCandidates(int timeoutMs) throws InterruptedException { synchronized (iceCandidateEvent) { - if (iceCandidates.size() == 0) { + final long endTimeMs = System.currentTimeMillis() + timeoutMs; + while (iceCandidates.size() == 0) { + final long waitTimeMs = endTimeMs - System.currentTimeMillis(); + if (waitTimeMs < 0) { + return false; + } iceCandidateEvent.wait(timeoutMs); } - return (iceCandidates.size() > 0); + return true; } } private boolean waitForIceConnected(int timeoutMs) throws InterruptedException { synchronized (iceConnectedEvent) { - if (!isIceConnected) { + final long endTimeMs = System.currentTimeMillis() + timeoutMs; + while (!isIceConnected) { + final long waitTimeMs = endTimeMs - System.currentTimeMillis(); + if (waitTimeMs < 0) { + Log.e(TAG, "ICE connection failure"); + return false; + } iceConnectedEvent.wait(timeoutMs); } - if (!isIceConnected) { - Log.e(TAG, "ICE connection failure"); - } - - return isIceConnected; + return true; } } private boolean waitForPeerConnectionClosed(int timeoutMs) throws InterruptedException { synchronized (closeEvent) { - if (!isClosed) { + final long endTimeMs = System.currentTimeMillis() + timeoutMs; + while (!isClosed) { + final long waitTimeMs = endTimeMs - System.currentTimeMillis(); + if (waitTimeMs < 0) { + return false; + } closeEvent.wait(timeoutMs); } - return isClosed; + return true; } } diff --git a/rtc_base/java/src/org/webrtc/ThreadUtils.java b/rtc_base/java/src/org/webrtc/ThreadUtils.java index df2c2d0565..f7c7b81a78 100644 --- a/rtc_base/java/src/org/webrtc/ThreadUtils.java +++ b/rtc_base/java/src/org/webrtc/ThreadUtils.java @@ -143,6 +143,8 @@ public class ThreadUtils { return result; } + // TODO(sakal): This method is broken. It should be removed: crbug.com/webrtc/8456 + @SuppressWarnings("WaitNotInLoop") public static void waitUninterruptibly(final Object object) { executeUninterruptibly(new BlockingOperation() { @Override diff --git a/sdk/android/api/org/webrtc/GlRectDrawer.java b/sdk/android/api/org/webrtc/GlRectDrawer.java index 6b36ede824..44787f7e27 100644 --- a/sdk/android/api/org/webrtc/GlRectDrawer.java +++ b/sdk/android/api/org/webrtc/GlRectDrawer.java @@ -176,13 +176,13 @@ public class GlRectDrawer implements RendererCommon.GlDrawer { shaders.put(fragmentShader, shader); shader.glShader.useProgram(); // Initialize fragment shader uniform values. - if (fragmentShader == YUV_FRAGMENT_SHADER_STRING) { + if (YUV_FRAGMENT_SHADER_STRING.equals(fragmentShader)) { GLES20.glUniform1i(shader.glShader.getUniformLocation("y_tex"), 0); GLES20.glUniform1i(shader.glShader.getUniformLocation("u_tex"), 1); GLES20.glUniform1i(shader.glShader.getUniformLocation("v_tex"), 2); - } else if (fragmentShader == RGB_FRAGMENT_SHADER_STRING) { + } else if (RGB_FRAGMENT_SHADER_STRING.equals(fragmentShader)) { GLES20.glUniform1i(shader.glShader.getUniformLocation("rgb_tex"), 0); - } else if (fragmentShader == OES_FRAGMENT_SHADER_STRING) { + } else if (OES_FRAGMENT_SHADER_STRING.equals(fragmentShader)) { GLES20.glUniform1i(shader.glShader.getUniformLocation("oes_tex"), 0); } else { throw new IllegalStateException("Unknown fragment shader: " + fragmentShader); diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java index 4304ff421b..49e1630608 100644 --- a/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java +++ b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java @@ -18,7 +18,6 @@ import android.media.MediaFormat; import android.os.Build; import android.os.SystemClock; import android.view.Surface; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.HashSet; @@ -562,6 +561,7 @@ public class MediaCodecVideoDecoder { } // Dequeues and returns a DecodedTextureBuffer if available, or null otherwise. + @SuppressWarnings("WaitNotInLoop") public DecodedTextureBuffer dequeueTextureBuffer(int timeoutMs) { synchronized (newFrameLock) { if (renderedBuffer == null && timeoutMs > 0 && isWaitingForTexture()) { diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java index 881255d9aa..0f6a12f3cd 100644 --- a/sdk/android/api/org/webrtc/PeerConnection.java +++ b/sdk/android/api/org/webrtc/PeerConnection.java @@ -315,7 +315,7 @@ public class PeerConnection { bundlePolicy = BundlePolicy.BALANCED; rtcpMuxPolicy = RtcpMuxPolicy.REQUIRE; tcpCandidatePolicy = TcpCandidatePolicy.ENABLED; - candidateNetworkPolicy = candidateNetworkPolicy.ALL; + candidateNetworkPolicy = CandidateNetworkPolicy.ALL; this.iceServers = iceServers; audioJitterBufferMaxPackets = 50; audioJitterBufferFastAccelerate = false; diff --git a/sdk/android/api/org/webrtc/VideoFileRenderer.java b/sdk/android/api/org/webrtc/VideoFileRenderer.java index bb6ebaa1b6..e7a6471124 100644 --- a/sdk/android/api/org/webrtc/VideoFileRenderer.java +++ b/sdk/android/api/org/webrtc/VideoFileRenderer.java @@ -84,6 +84,9 @@ public class VideoFileRenderer implements VideoRenderer.Callbacks { }); } + // TODO(sakal): yuvConverter.convert is deprecated. This will be removed once this file is updated + // to implement VideoSink instead of VideoRenderer.Callbacks. + @SuppressWarnings("deprecation") private void renderFrameOnRenderThread(VideoRenderer.I420Frame frame) { final float frameAspectRatio = (float) frame.rotatedWidth() / (float) frame.rotatedHeight(); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java index cb8ad5f1ef..3ab05545fb 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java @@ -59,9 +59,6 @@ public class Camera1CapturerUsingByteBufferTest { @Before public void setUp() { - // Enable VideoFrame capture. - PeerConnectionFactory.initializeFieldTrials(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL + "/" - + PeerConnectionFactory.TRIAL_ENABLED + "/"); fixtures = new CameraVideoCapturerTestFixtures(new TestObjectFactory()); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java index fd74ee57af..10fcad217c 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java @@ -54,9 +54,6 @@ public class Camera1CapturerUsingTextureTest { @Before public void setUp() { - // Enable VideoFrame capture. - PeerConnectionFactory.initializeFieldTrials(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL + "/" - + PeerConnectionFactory.TRIAL_ENABLED + "/"); fixtures = new CameraVideoCapturerTestFixtures(new TestObjectFactory()); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java index a256294f34..6b6b18d1ed 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java @@ -183,9 +183,6 @@ public class Camera2CapturerTest { @Before public void setUp() { - // Enable VideoFrame capture. - PeerConnectionFactory.initializeFieldTrials(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL + "/" - + PeerConnectionFactory.TRIAL_ENABLED + "/"); fixtures = new CameraVideoCapturerTestFixtures(new TestObjectFactory()); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java index d7130b86ab..d8e3d5bf23 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java @@ -38,8 +38,8 @@ class CameraVideoCapturerTestFixtures { static final int DEFAULT_FPS = 15; static private class RendererCallbacks implements VideoRenderer.Callbacks { + private final Object frameLock = new Object(); private int framesRendered = 0; - private Object frameLock = 0; private int width = 0; private int height = 0; @@ -69,7 +69,10 @@ class CameraVideoCapturerTestFixtures { public int waitForNextFrameToRender() throws InterruptedException { Logging.d(TAG, "Waiting for the next frame to render"); synchronized (frameLock) { - frameLock.wait(); + final int framesRenderedStart = framesRendered; + while (framesRendered == framesRenderedStart) { + frameLock.wait(); + } return framesRendered; } } @@ -103,7 +106,7 @@ class CameraVideoCapturerTestFixtures { private VideoFrame videoFrame; final private Object frameLock = new Object(); final private Object capturerStartLock = new Object(); - private boolean capturerStartResult = false; + private Boolean capturerStartResult; final private List timestamps = new ArrayList(); @Override @@ -150,7 +153,9 @@ class CameraVideoCapturerTestFixtures { public boolean waitForCapturerToStart() throws InterruptedException { Logging.d(TAG, "Waiting for the capturer to start"); synchronized (capturerStartLock) { - capturerStartLock.wait(); + while (capturerStartResult == null) { + capturerStartLock.wait(); + } return capturerStartResult; } } @@ -158,7 +163,10 @@ class CameraVideoCapturerTestFixtures { public int waitForNextCapturedFrame() throws InterruptedException { Logging.d(TAG, "Waiting for the next captured frame"); synchronized (frameLock) { - frameLock.wait(); + final int framesCapturedStart = framesCaptured; + while (framesCaptured == framesCapturedStart) { + frameLock.wait(); + } return framesCaptured; } } @@ -196,9 +204,9 @@ class CameraVideoCapturerTestFixtures { static class CameraEvents implements CameraVideoCapturer.CameraEventsHandler { public boolean onCameraOpeningCalled; public boolean onFirstFrameAvailableCalled; - public final Object onCameraFreezedLock = new Object(); + private final Object onCameraFreezedLock = new Object(); private String onCameraFreezedDescription; - public final Object cameraClosedLock = new Object(); + private final Object cameraClosedLock = new Object(); private boolean cameraClosed = true; @Override @@ -242,7 +250,9 @@ class CameraVideoCapturerTestFixtures { public String waitForCameraFreezed() throws InterruptedException { Logging.d(TAG, "Waiting for the camera to freeze"); synchronized (onCameraFreezedLock) { - onCameraFreezedLock.wait(); + while (onCameraFreezedDescription == null) { + onCameraFreezedLock.wait(); + } return onCameraFreezedDescription; } } @@ -334,7 +344,11 @@ class CameraVideoCapturerTestFixtures { private TestObjectFactory testObjectFactory; CameraVideoCapturerTestFixtures(TestObjectFactory testObjectFactory) { - PeerConnectionFactory.initializeAndroidGlobals(testObjectFactory.getAppContext(), true); + PeerConnectionFactory.initialize( + PeerConnectionFactory.InitializationOptions.builder(testObjectFactory.getAppContext()) + .setFieldTrials(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL + "/" + + PeerConnectionFactory.TRIAL_ENABLED + "/") + .createInitializationOptions()); this.peerConnectionFactory = new PeerConnectionFactory(null /* options */); this.testObjectFactory = testObjectFactory; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java index 9b95b769f6..0205490c12 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java @@ -81,10 +81,15 @@ public class EglRendererTest { } public synchronized boolean waitForBitmap(int timeoutMs) throws InterruptedException { - if (!bitmapReceived) { + final long endTimeMs = System.currentTimeMillis() + timeoutMs; + while (!bitmapReceived) { + final long waitTimeMs = endTimeMs - System.currentTimeMillis(); + if (waitTimeMs < 0) { + return false; + } wait(timeoutMs); } - return bitmapReceived; + return true; } public synchronized Bitmap resetAndGetBitmap() { @@ -102,8 +107,9 @@ public class EglRendererTest { @Before public void setUp() throws Exception { - PeerConnectionFactory.initializeAndroidGlobals( - InstrumentationRegistry.getTargetContext(), true /* videoHwAcceleration */); + PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions + .builder(InstrumentationRegistry.getTargetContext()) + .createInitializationOptions()); eglRenderer = new EglRenderer("TestRenderer: "); eglRenderer.init(null /* sharedContext */, EglBase.CONFIG_RGBA, new GlRectDrawer()); oesTextureId = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java index e117ce62fd..22acf86dfb 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java @@ -243,7 +243,7 @@ public class HardwareVideoEncoderTest { } // # Test fields - private Object referencedFramesLock = new Object(); + private final Object referencedFramesLock = new Object(); private int referencedFrames = 0; private Runnable releaseFrameCallback = new Runnable() { diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java index 923bd3ccf0..579fba76b6 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java @@ -181,7 +181,7 @@ public class NetworkMonitorTest { private NetworkMonitorAutoDetect.ConnectionType getCurrentConnectionType() { final NetworkMonitorAutoDetect.NetworkState networkState = receiver.getCurrentNetworkState(); - return receiver.getConnectionType(networkState); + return NetworkMonitorAutoDetect.getConnectionType(networkState); } @Before diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java index 9718894c4c..da5c136c7c 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java @@ -50,7 +50,9 @@ public class PeerConnectionTest { @Before public void setUp() { - PeerConnectionFactory.initializeAndroidGlobals(InstrumentationRegistry.getContext(), true); + PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions + .builder(InstrumentationRegistry.getTargetContext()) + .createInitializationOptions()); } private static class ObserverExpectations @@ -575,9 +577,12 @@ public class PeerConnectionTest { public void testCreationWithConfig() throws Exception { PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); PeerConnectionFactory factory = new PeerConnectionFactory(options); - List iceServers = - Arrays.asList(new PeerConnection.IceServer("stun:stun.l.google.com:19302"), - new PeerConnection.IceServer("turn:fake.example.com", "fakeUsername", "fakePassword")); + List iceServers = Arrays.asList( + PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer(), + PeerConnection.IceServer.builder("turn:fake.example.com") + .setUsername("fakeUsername") + .setPassword("fakePassword") + .createIceServer()); PeerConnection.RTCConfiguration config = new PeerConnection.RTCConfiguration(iceServers); // Test configuration options. @@ -605,9 +610,12 @@ public class PeerConnectionTest { pcConstraints.mandatory.add(new MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true")); LinkedList iceServers = new LinkedList(); - iceServers.add(new PeerConnection.IceServer("stun:stun.l.google.com:19302")); iceServers.add( - new PeerConnection.IceServer("turn:fake.example.com", "fakeUsername", "fakePassword")); + PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()); + iceServers.add(PeerConnection.IceServer.builder("turn:fake.example.com") + .setUsername("fakeUsername") + .setPassword("fakePassword") + .createIceServer()); ObserverExpectations offeringExpectations = new ObserverExpectations("PCTest:offerer"); PeerConnection offeringPC = factory.createPeerConnection(iceServers, pcConstraints, offeringExpectations); @@ -842,9 +850,12 @@ public class PeerConnectionTest { pcConstraints.mandatory.add(new MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true")); LinkedList iceServers = new LinkedList(); - iceServers.add(new PeerConnection.IceServer("stun:stun.l.google.com:19302")); iceServers.add( - new PeerConnection.IceServer("turn:fake.example.com", "fakeUsername", "fakePassword")); + PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()); + iceServers.add(PeerConnection.IceServer.builder("turn:fake.example.com") + .setUsername("fakeUsername") + .setPassword("fakePassword") + .createIceServer()); ObserverExpectations offeringExpectations = new ObserverExpectations("PCTest:offerer"); PeerConnection offeringPC = factory.createPeerConnection(iceServers, pcConstraints, offeringExpectations); @@ -994,7 +1005,8 @@ public class PeerConnectionTest { pcConstraints.mandatory.add(new MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true")); LinkedList iceServers = new LinkedList(); - iceServers.add(new PeerConnection.IceServer("stun:stun.l.google.com:19302")); + iceServers.add( + PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()); ObserverExpectations offeringExpectations = new ObserverExpectations("PCTest:offerer"); PeerConnection offeringPC = @@ -1351,6 +1363,7 @@ public class PeerConnectionTest { assertTrue(info.samples.size() > 0); } + @SuppressWarnings("deprecation") // TODO(sakal): getStats is deprecated private static void shutdownPC(PeerConnection pc, ObserverExpectations expectations) { if (expectations.dataChannel != null) { expectations.dataChannel.unregisterObserver(); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java index 6faf723e03..ebee38dd64 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java @@ -25,8 +25,9 @@ public class WebRtcJniBootTest { @Test @SmallTest public void testJniLoadsWithoutError() throws InterruptedException { - PeerConnectionFactory.initializeAndroidGlobals(InstrumentationRegistry.getTargetContext(), - false /* videoCodecHwAcceleration */); + PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions + .builder(InstrumentationRegistry.getTargetContext()) + .createInitializationOptions()); PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); new PeerConnectionFactory(options); diff --git a/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java b/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java index e758953a1e..e9d7c58485 100644 --- a/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java +++ b/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java @@ -122,7 +122,7 @@ class HardwareVideoDecoder } // Metadata for the last frame rendered to the texture. - private Object renderedTextureMetadataLock = new Object(); + private final Object renderedTextureMetadataLock = new Object(); private DecodedTextureMetadata renderedTextureMetadata; // Decoding proceeds asynchronously. This callback returns decoded frames to the caller. Valid