Do not throw uncaught exception in UI thread

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>

app/src/main/java/net/ossrs/yasea/MainActivity.java

@@ -251,28 +251,6 @@ public class MainActivity extends Activity {
             }
         });
 
-        mPublisher.setNetworkEventHandler(new SrsEncoder.EventHandler() {
-            @Override
-            public void onNetworkResume(final String msg) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-
-            @Override
-            public void onNetworkWeak(final String msg) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-        });
-
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
             public void uncaughtException(Thread thread, Throwable ex) {

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

@@ -8,6 +8,7 @@ import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
 import android.view.SurfaceHolder;
+import android.widget.Toast;
 
 import com.seu.magicfilter.base.MagicCameraInputFilter;
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
@@ -48,7 +49,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
     private IntBuffer mGLPreviewIntBuffer;
     private ByteBuffer mGLPreviewByteBuffer;
     private byte[] mYuvPreviewBuffer;
-    private int mCamId = 1;
+    private int mCamId = Camera.CameraInfo.CAMERA_FACING_FRONT;
     private int mPreviewRotation = 90;
 
     private Thread worker;
@@ -194,12 +195,12 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
         return mCamId;
     }
 
-    public void startCamera() {
+    public int startCamera() {
         if (mCamera != null) {
-            return;
+            return -1;
         }
         if (mCamId > (Camera.getNumberOfCameras() - 1) || mCamId < 0) {
-            return;
+            return -1;
         }
 
         worker = new Thread(new Runnable() {
@@ -230,8 +231,9 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
         Camera.Parameters params = mCamera.getParameters();
         Camera.Size size = mCamera.new Size(previewWidth, previewHeight);
         if (!params.getSupportedPreviewSizes().contains(size) || !params.getSupportedPictureSizes().contains(size)) {
-            Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(),
+            Toast.makeText(getContext(), String.format("Unsupported resolution %dx%d", size.width, size.height), Toast.LENGTH_SHORT).show();
-                    new IllegalArgumentException(String.format("Unsupported resolution %dx%d", size.width, size.height)));
+            stopCamera();
+            return -1;
         }
 
         if (params.getSupportedFocusModes().contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {

app/src/main/java/net/ossrs/yasea/SrsPublisher.java

@@ -78,7 +78,10 @@ public class SrsPublisher {
             return;
         }
 
-        mCameraView.startCamera();
+        if (mCameraView.startCamera() < 0) {
+            mEncoder.stop();
+            return;
+        }
         mCameraView.setFilter(filterType);
 
         aworker = new Thread(new Runnable() {