From e6fcf3ff6c093c89f712974a71ccc33157e665f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Tue, 17 Jul 2018 11:25:52 +0200 Subject: [PATCH] Update CameraCapturer to use the new CapturerObserver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#24006} --- sdk/android/src/java/org/webrtc/CameraCapturer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java index 08c6c6b0d5..6addd3664d 100644 --- a/sdk/android/src/java/org/webrtc/CameraCapturer.java +++ b/sdk/android/src/java/org/webrtc/CameraCapturer.java @@ -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;