From 101298534f045e849c2381e55e1448e0f788dda8 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Mon, 28 Oct 2024 17:03:36 +0800
Subject: [PATCH] =?UTF-8?q?Camera2=20=E4=BF=AE=E6=94=B9adb=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/mplive/MainActivity.java | 31 +++++++++++++------
 .../java/net/ossrs/yasea/SrsCameraView.java   |  4 +--
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/xypower/mplive/MainActivity.java b/app/src/main/java/com/xypower/mplive/MainActivity.java
index 9a497e8..05ea909 100644
--- a/app/src/main/java/com/xypower/mplive/MainActivity.java
+++ b/app/src/main/java/com/xypower/mplive/MainActivity.java
@@ -162,30 +162,40 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
         mPublisher.setOutputResolution(mHeight, mWidth); // 这里要和preview反过来
 
         mPublisher.setVideoHDMode();
-        if (intent.hasExtra("cameraId")) {
-            cameraId = intent.getIntExtra("cameraId", 0);
-            mPublisher.switchCameraFace(cameraId);
-        }
-        mPublisher.startCamera();
+
+
+        cameraId = intent.getIntExtra("cameraId", 0);
+//        mPublisher.startCamera();
 
         mCameraView.setCameraCallbacksHandler(new SrsCameraView.CameraCallbacksHandler() {
             @Override
             public void onCameraParameters(Camera.Parameters params) {
-                //params.setFocusMode("custom-focus");
-                //params.setWhiteBalance("custom-balance");
-                //etc...
                 Log.e("fsfs", "fsdf");
             }
         });
 
         int autoStart = intent.getIntExtra("autoStart", 0);
         if (autoStart != 0) {
+            mPublisher.switchCameraFace(cameraId);
             mHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    btnPublish.performClick();
+                    SharedPreferences.Editor editor = sp.edit();
+                    editor.putString("rtmpUrl", rtmpUrl);
+                    editor.apply();
+                    mPublisher.startPublish(rtmpUrl);
+                    if (btnSwitchEncoder.getText().toString().contentEquals("soft encoder")) {
+                        Toast.makeText(getApplicationContext(), "Use hard encoder", Toast.LENGTH_SHORT).show();
+                    } else {
+                        Toast.makeText(getApplicationContext(), "Use soft encoder", Toast.LENGTH_SHORT).show();
+                    }
+                    btnPublish.setText("stop");
+                    btnSwitchEncoder.setEnabled(false);
+                    btnPause.setEnabled(true);
                 }
             }, 500);
+        } else {
+            mPublisher.switchCameraFace(cameraId);
         }
 
         int autoClose = intent.getIntExtra("autoClose", 0);
@@ -210,7 +220,8 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
                     editor.apply();
 
                     mPublisher.startPublish(rtmpUrl);
-                    mPublisher.startCamera();
+//                    mPublisher.startCamera();
+                    mPublisher.switchCameraFace(cameraId);
 
                     if (btnSwitchEncoder.getText().toString().contentEquals("soft encoder")) {
                         Toast.makeText(getApplicationContext(), "Use hard encoder", Toast.LENGTH_SHORT).show();
diff --git a/library/src/main/java/net/ossrs/yasea/SrsCameraView.java b/library/src/main/java/net/ossrs/yasea/SrsCameraView.java
index 6b56e9e..d18ea04 100644
--- a/library/src/main/java/net/ossrs/yasea/SrsCameraView.java
+++ b/library/src/main/java/net/ossrs/yasea/SrsCameraView.java
@@ -93,6 +93,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
         setRenderer(this);
         setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
         initCameraData();
+        magicFilter = new GPUImageFilter(MagicFilterType.NONE);
     }
 
     @Override
@@ -101,7 +102,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
         GLES20.glDisable(GL10.GL_DITHER);
         GLES20.glClearColor(0, 0, 0, 0);
         String id = curItem.getId();
-        magicFilter = new GPUImageFilter(MagicFilterType.NONE);
+
         try {
             cameraid = Integer.parseInt(id);
         } catch (Exception e) {
@@ -387,7 +388,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
 
                 @Override
                 public void onConfigureFailed(CameraCaptureSession session) {
-                    Log.e("dkkd", "fdsa");
                 }
             }, null);
         } catch (CameraAccessException e) {