admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-add SurfaceTexture as member for setLocalPreview in VideoCapturerAndroid.

Browse Source 
The Android camera api requires a surface to be set in order work. In https://codereview.webrtc.org/1354683004/ this surfaceTexture was removed as a member but it turns out that can lead to camera freezes when the device is rotated. This cl re-adds the surface as a member.

BUG= webrtc:5021, webrtc:5003
R=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/1349433003 .

Cr-Commit-Position: refs/heads/master@{#9999}
This commit is contained in:
Per 2015-09-21 13:57:36 +02:00
parent 40bf493754
commit e6d3adab08
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
View File

@ -76,6 +76,8 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
private Camera camera; // Only non-null while capturing.
private CameraThread cameraThread;
private Handler cameraThreadHandler;
// |cameraSurfaceTexture| is used with setPreviewTexture. Must be a member, see issue webrtc:5021.
private SurfaceTexture cameraSurfaceTexture;
private Context applicationContext;
private int id;
private Camera.CameraInfo info;
@ -321,9 +323,8 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
// and never call updateTexImage on it.
try {
cameraGlTexture = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
SurfaceTexture cameraSurfaceTexture = new SurfaceTexture(cameraGlTexture);
cameraSurfaceTexture = new SurfaceTexture(cameraGlTexture);
cameraSurfaceTexture.setOnFrameAvailableListener(null);
camera.setPreviewTexture(cameraSurfaceTexture);
} catch (IOException e) {
Logging.e(TAG, "setPreviewTexture failed", error);
@ -461,6 +462,7 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
Logging.d(TAG, "Release camera.");
camera.release();
camera = null;
cameraSurfaceTexture = null;
}
private void switchCameraOnCameraThread(Runnable switchDoneEvent) {