zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nullablity on CameraCapturer

Browse Source 
Both cameraThreadHandler and surfaceHelper shouldn't be null.

Bug: None
Change-Id: I3c239c4275c53b836bbc2e9d6af71bf2b1b65387
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161480
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30047}
This commit is contained in:
Byoungchan Lee
2019-12-07 02:22:48 +09:00
committed by Commit Bot
parent 1425d40369
commit 5f728fc04f
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/android/src/java/org/webrtc/CameraCapturer.java
View File

@ -30,7 +30,7 @@ abstract class CameraCapturer implements CameraVideoCapturer {
private final static int OPEN_CAMERA_TIMEOUT = 10000; private final static int OPEN_CAMERA_TIMEOUT = 10000;
private final CameraEnumerator cameraEnumerator; private final CameraEnumerator cameraEnumerator;
@Nullable private final CameraEventsHandler eventsHandler; private final CameraEventsHandler eventsHandler;
private final Handler uiThreadHandler; private final Handler uiThreadHandler;
@Nullable @Nullable
@ -175,10 +175,10 @@ abstract class CameraCapturer implements CameraVideoCapturer {
// Initialized on initialize // Initialized on initialize
// ------------------------- // -------------------------
@Nullable private Handler cameraThreadHandler; private Handler cameraThreadHandler;
private Context applicationContext; private Context applicationContext;
private org.webrtc.CapturerObserver capturerObserver; private org.webrtc.CapturerObserver capturerObserver;
@Nullable private SurfaceTextureHelper surfaceHelper; private SurfaceTextureHelper surfaceHelper;
private final Object stateLock = new Object(); private final Object stateLock = new Object();
private boolean sessionOpening; /* guarded by stateLock */ private boolean sessionOpening; /* guarded by stateLock */
@ -230,13 +230,12 @@ abstract class CameraCapturer implements CameraVideoCapturer {
} }
@Override @Override
public void initialize(@Nullable SurfaceTextureHelper surfaceTextureHelper, public void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext,
Context applicationContext, org.webrtc.CapturerObserver capturerObserver) { org.webrtc.CapturerObserver capturerObserver) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
this.capturerObserver = capturerObserver; this.capturerObserver = capturerObserver;
this.surfaceHelper = surfaceTextureHelper; this.surfaceHelper = surfaceTextureHelper;
this.cameraThreadHandler = this.cameraThreadHandler = surfaceTextureHelper.getHandler();
surfaceTextureHelper == null ? null : surfaceTextureHelper.getHandler();
} }
@Override @Override