Merge pull request #694 from thegobot/master

Update SrsCameraView.java

library/src/main/java/net/ossrs/yasea/SrsCameraView.java

@@ -144,9 +144,14 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
     }
 
     public int[] setPreviewResolution(int width, int height) {                
-        //getHolder().setFixedSize(width, height);
         
-        mCamera = openCamera();
+        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;
     }
 

library/src/main/java/net/ossrs/yasea/SrsEncoder.java

@@ -187,14 +187,22 @@ public class SrsEncoder {
 
         if (aencoder != null) {
             Log.i(TAG, "stop aencoder");
-            aencoder.stop();
+            try {
+                aencoder.stop();
+            }catch (IllegalStateException e){
+                e.printStackTrace();
+            }
             aencoder.release();
             aencoder = null;
         }
 
         if (vencoder != null) {
             Log.i(TAG, "stop vencoder");
-            vencoder.stop();
+            try {
+                vencoder.stop();
+            }catch (IllegalStateException e){
+                e.printStackTrace();
+            }
             vencoder.release();
             vencoder = null;
         }