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

Update CameraCapturer to use the new CapturerObserver.

Browse Source 
Full path is specified because otherwise the inner class from
VideoCapturer is used instead.

Bug: webrtc:9496
Change-Id: I122e6525101594863d506eb3c12359b5648d935e
Reviewed-on: https://webrtc-review.googlesource.com/89042
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24006}
This commit is contained in:
Sami Kalliomäki
2018-07-17 11:25:52 +02:00
committed by Commit Bot
parent ca536d4692
commit e6fcf3ff6c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ package org.webrtc;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import javax.annotation.Nullable;
import java.util.Arrays;
import javax.annotation.Nullable;
@SuppressWarnings("deprecation")
abstract class CameraCapturer implements CameraVideoCapturer {
@ -177,7 +177,7 @@ abstract class CameraCapturer implements CameraVideoCapturer {
// -------------------------
@Nullable private Handler cameraThreadHandler;
private Context applicationContext;
private CapturerObserver capturerObserver;
private org.webrtc.CapturerObserver capturerObserver;
@Nullable private SurfaceTextureHelper surfaceHelper;
private final Object stateLock = new Object();
@ -231,7 +231,7 @@ abstract class CameraCapturer implements CameraVideoCapturer {
@Override
public void initialize(@Nullable SurfaceTextureHelper surfaceTextureHelper,
Context applicationContext, CapturerObserver capturerObserver) {
Context applicationContext, org.webrtc.CapturerObserver capturerObserver) {
this.applicationContext = applicationContext;
this.capturerObserver = capturerObserver;
this.surfaceHelper = surfaceTextureHelper;