From 3ce4b85f2a3b56a0629cfa5d9d64577d9c297efe Mon Sep 17 00:00:00 2001 From: thegobot Date: Wed, 6 Mar 2019 16:05:26 +0800 Subject: [PATCH] Update SrsCameraView.java --- .../java/net/ossrs/yasea/SrsCameraView.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/library/src/main/java/net/ossrs/yasea/SrsCameraView.java b/library/src/main/java/net/ossrs/yasea/SrsCameraView.java index 22ac836..06871fe 100644 --- a/library/src/main/java/net/ossrs/yasea/SrsCameraView.java +++ b/library/src/main/java/net/ossrs/yasea/SrsCameraView.java @@ -143,10 +143,15 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render this.mCamera.setPreviewCallback(previewCallback); } - public int[] setPreviewResolution(int width, int height) { - //getHolder().setFixedSize(width, height); - - mCamera = openCamera(); + public int[] setPreviewResolution(int width, int height) { + + if (mCamera == null) { + mCamera = openCamera(); + if (mCamera == null) { + return new int[] { 0, 0}; + } + } + mPreviewWidth = width; mPreviewHeight = height; Camera.Size rs = adaptPreviewResolution(mCamera.new Size(width, height)); @@ -367,7 +372,13 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render mCamId = 0; } } - camera = Camera.open(mCamId); + + try { + camera = Camera.open(mCamId); + }catch (Exception e){ + e.printStackTrace(); + } + return camera; }