Fix camera switch bug

The encoder should be available when camera is opened.

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

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

@@ -106,9 +106,7 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
         btnSwitchCamera.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (Camera.getNumberOfCameras() > 0) {
+                mPublisher.switchCameraFace((mPublisher.getCamraId() + 1) % Camera.getNumberOfCameras());
-                    mPublisher.switchCameraFace((mPublisher.getCamraId() + 1) % Camera.getNumberOfCameras());
-                }
             }
         });
 

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

@@ -52,6 +52,7 @@ public class SrsEncoder {
     private boolean networkWeakTriggered = false;
     private boolean mCameraFaceFront = true;
     private boolean useSoftEncoder = false;
+    private boolean canSoftEncoder = false;
 
     private long mPresentTimeUs;
 
@@ -113,8 +114,11 @@ public class SrsEncoder {
         setEncoderBitrate(vBitrate);
         setEncoderPreset(x264Preset);
 
-        if (useSoftEncoder && !openSoftEncoder()) {
+        if (useSoftEncoder) {
-            return false;
+            canSoftEncode = openSoftEncoder();
+            if (!canSoftEncode) {
+                return false;
+            }
         }
 
         // aencoder pcm to aac raw stream.
@@ -170,6 +174,7 @@ public class SrsEncoder {
     public void stop() {
         if (useSoftEncoder) {
             closeSoftEncoder();
+            canSoftEncode = false;
         }
 
         if (aencoder != null) {
@@ -195,11 +200,11 @@ public class SrsEncoder {
         mCameraFaceFront = false;
     }
 
-    public void swithToSoftEncoder() {
+    public void switchToSoftEncoder() {
         useSoftEncoder = true;
     }
 
-    public void swithToHardEncoder() {
+    public void switchToHardEncoder() {
         useSoftEncoder = false;
     }
 
@@ -207,6 +212,18 @@ public class SrsEncoder {
         return useSoftEncoder;
     }
 
+    public boolean canHardEncode() {
+        return vencoder != null;
+    }
+
+    public boolean canSoftEncode() {
+        return canSoftEncode;
+    }
+
+    public boolean isEnabled() {
+        return canHardEncode() || canSoftEncode();
+    }
+
     public void setPreviewResolution(int width, int height) {
         vPrevWidth = width;
         vPrevHeight = height;

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

@@ -144,12 +144,12 @@ public class SrsPublisher {
         }
     }
 
-    public void swithToSoftEncoder() {
+    public void switchToSoftEncoder() {
-        mEncoder.swithToSoftEncoder();
+        mEncoder.switchToSoftEncoder();
     }
 
-    public void swithToHardEncoder() {
+    public void switchToHardEncoder() {
-        mEncoder.swithToHardEncoder();
+        mEncoder.switchToHardEncoder();
     }
 
     public boolean isSoftEncoder() {
@@ -207,14 +207,16 @@ public class SrsPublisher {
     }
 
     public void switchCameraFace(int id) {
-        mCameraView.setCameraId(id);
+        if (mEncoder.isEnabled()) {
-        mCameraView.stopCamera();
+            mCameraView.stopCamera();
-        if (id == 0) {
+            mCameraView.setCameraId(id);
-            mEncoder.setCameraBackFace();
+            if (id == 0) {
-        } else {
+                mEncoder.setCameraBackFace();
-            mEncoder.setCameraFrontFace();
+            } else {
+                mEncoder.setCameraFrontFace();
+            }
+            mCameraView.startCamera();
         }
-        mCameraView.startCamera();
     }
 
     private void startAudio() {