Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java

Issue 1738123002: Java SurfaceTextureHelper: Remove support for external thread (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
index f0536c6d92c373a52f7e16454085eca6e0ff8b73..a696805b2ac08cf7422b3dc733238e8edd200ab9 100644
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -12,7 +12,6 @@ package org.webrtc;
import android.content.Context;
import android.os.Handler;
-import android.os.HandlerThread;
import android.os.SystemClock;
import android.view.Surface;
import android.view.WindowManager;
@@ -53,7 +52,7 @@ public class VideoCapturerAndroid implements
private final static int CAMERA_FREEZE_REPORT_TIMOUT_MS = 6000;
private android.hardware.Camera camera; // Only non-null while capturing.
- private HandlerThread cameraThread;
+ private Thread cameraThread;
private final Handler cameraThreadHandler;
private Context applicationContext;
// Synchronization lock for |id|.
@@ -302,12 +301,11 @@ public class VideoCapturerAndroid implements
EglBase.Context sharedContext) {
this.id = cameraId;
this.eventsHandler = eventsHandler;
- cameraThread = new HandlerThread(TAG);
- cameraThread.start();
- cameraThreadHandler = new Handler(cameraThread.getLooper());
isCapturingToTexture = (sharedContext != null);
cameraStatistics = new CameraStatistics();
- surfaceHelper = SurfaceTextureHelper.create(sharedContext, cameraThreadHandler);
+ surfaceHelper = SurfaceTextureHelper.create(sharedContext);
+ cameraThreadHandler = surfaceHelper.getHandler();
+ cameraThread = cameraThreadHandler.getLooper().getThread();
if (isCapturingToTexture) {
surfaceHelper.setListener(this);
}
@@ -354,11 +352,11 @@ public class VideoCapturerAndroid implements
}
}
});
- surfaceHelper.disconnect(cameraThreadHandler);
+ surfaceHelper.disconnect();
cameraThread = null;
}
- // Used for testing purposes to check if release() has been called.
+ // Used for testing purposes to check if dispose() has been called.
public boolean isDisposed() {
return (cameraThread == null);
}
« no previous file with comments | « webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698