From 8b42f2ce757bb4eb2254ef01856c5b8711242fa7 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 6 Nov 2024 14:25:09 +0800 Subject: [PATCH] =?UTF-8?q?Camera2=20=E4=BF=AE=E6=94=B9=E6=97=8B=E8=BD=AC?= =?UTF-8?q?=E8=A7=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xypower/mplive/MainActivity.java | 2 +- .../base/gpuimage/GPUImageFilter.java | 90 ++++++------------- .../java/net/ossrs/yasea/SrsCameraView.java | 4 +- .../java/net/ossrs/yasea/SrsPublisher.java | 8 +- 4 files changed, 30 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/xypower/mplive/MainActivity.java b/app/src/main/java/com/xypower/mplive/MainActivity.java index 6a25cb2..96e984b 100644 --- a/app/src/main/java/com/xypower/mplive/MainActivity.java +++ b/app/src/main/java/com/xypower/mplive/MainActivity.java @@ -180,7 +180,7 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL mHandler.postDelayed(new Runnable() { @Override public void run() { - rtmpUrl = "rtmp://61.169.135.146/live/0"; +// rtmpUrl = "rtmp://61.169.135.146/live/0"; SharedPreferences.Editor editor = sp.edit(); editor.putString("rtmpUrl", rtmpUrl); editor.apply(); diff --git a/library/src/main/java/com/seu/magicfilter/base/gpuimage/GPUImageFilter.java b/library/src/main/java/com/seu/magicfilter/base/gpuimage/GPUImageFilter.java index b84d07c..56c65d0 100644 --- a/library/src/main/java/com/seu/magicfilter/base/gpuimage/GPUImageFilter.java +++ b/library/src/main/java/com/seu/magicfilter/base/gpuimage/GPUImageFilter.java @@ -413,18 +413,15 @@ public class GPUImageFilter { } //设置纹理旋转角度 - public void setOrtation(int i, int rotation) { - //纹理坐标 - TEX_COORD = new float[]{0.0f, 0.0f, // Bottom left. - 1.0f, 0.0f, // Bottom right. - 0.0f, 1.0f, // Top left. - 1.0f, 1.0f // Top right. - }; - final float TEX_COORD_270[] = {0.0f, 0.0f, // Bottom left. - 1.0f, 0.0f, // Bottom right. - 0.0f, 1.0f, // Top left. - 1.0f, 1.0f // Top right. - }; + public void setOrtation(int rotation) { + +// //纹理坐标 +// TEX_COORD = new float[]{0.0f, 0.0f, // Bottom left. +// 1.0f, 0.0f, // Bottom right. +// 0.0f, 1.0f, // Top left. +// 1.0f, 1.0f // Top right. +// }; + final float TEX_COORD0[] = { //1号摄像头 正 0.0f, 1.0f, // Bottom left. @@ -446,61 +443,26 @@ public class GPUImageFilter { 0.0f, 0.0f, // Top left. 0.0f, 1.0f // Top right. }; - if (rotation == -1) { - if (i == 0) { - TEX_COORD = TEX_COORD0; - } else if (i == 1) { - TEX_COORD = TEX_COORD_90; - } else if (i == 2) { - TEX_COORD = TEX_COORD_180; - } else if (i == 3) { - TEX_COORD = TEX_COORD_270; - } + + final float TEX_COORD_270[] = {0.0f, 0.0f, // Bottom left. + 1.0f, 0.0f, // Bottom right. + 0.0f, 1.0f, // Top left. + 1.0f, 1.0f // Top right. + }; + //纹理坐标 + TEX_COORD = TEX_COORD0; + if (rotation == 0) { + TEX_COORD = TEX_COORD0; + } else if (rotation == 90) { + TEX_COORD = TEX_COORD_270; + } else if (rotation == 180) { + TEX_COORD = TEX_COORD_180; + } else if (rotation == 270) { + TEX_COORD = TEX_COORD_90; } else { - if (rotation == 0) { - if (i == 0) { - TEX_COORD = TEX_COORD0; - } else if (i == 1) { - TEX_COORD = TEX_COORD_90; - } else if (i == 2) { - TEX_COORD = TEX_COORD_180; - } else if (i == 3) { - TEX_COORD = TEX_COORD_270; - } - } else if (rotation == 1) { - if (i == 0) { - TEX_COORD = TEX_COORD_90; - } else if (i == 1) { - TEX_COORD = TEX_COORD_180; - } else if (i == 2) { - TEX_COORD = TEX_COORD_270; - } else if (i == 3) { - TEX_COORD = TEX_COORD0; - } - } else if (i == 2) { - if (i == 0) { - TEX_COORD = TEX_COORD_180; - } else if (i == 1) { - TEX_COORD = TEX_COORD_270; - } else if (i == 2) { - TEX_COORD = TEX_COORD0; - } else if (i == 3) { - TEX_COORD = TEX_COORD_90; - } - } else if (i == 3) { - if (i == 0) { - TEX_COORD = TEX_COORD_270; - } else if (i == 1) { - TEX_COORD = TEX_COORD0; - } else if (i == 2) { - TEX_COORD = TEX_COORD_90; - } else if (i == 3) { - TEX_COORD = TEX_COORD_180; - } - } + TEX_COORD = TEX_COORD0; } - } } diff --git a/library/src/main/java/net/ossrs/yasea/SrsCameraView.java b/library/src/main/java/net/ossrs/yasea/SrsCameraView.java index f5fc9ab..77ea32b 100644 --- a/library/src/main/java/net/ossrs/yasea/SrsCameraView.java +++ b/library/src/main/java/net/ossrs/yasea/SrsCameraView.java @@ -522,8 +522,8 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render return closestRange; } - public void setOrtation(int cameraid,int rotation) { - magicFilter.setOrtation(cameraid,rotation); + public void setOrtation(int rotation) { + magicFilter.setOrtation(rotation); } public void stopTorch() { diff --git a/library/src/main/java/net/ossrs/yasea/SrsPublisher.java b/library/src/main/java/net/ossrs/yasea/SrsPublisher.java index f6ca890..ef5b53b 100644 --- a/library/src/main/java/net/ossrs/yasea/SrsPublisher.java +++ b/library/src/main/java/net/ossrs/yasea/SrsPublisher.java @@ -312,14 +312,8 @@ public class SrsPublisher { public void switchCameraFace(int id, int rotation) { List cameraData = mCameraView.getCameraData(); CameraItemData item = cameraData.get(id); - int cameraid = 0; - try { - cameraid = Integer.parseInt(item.getId()); - } catch (Exception e) { - cameraid = 0; - } - mCameraView.setOrtation(cameraid, rotation); + mCameraView.setOrtation(rotation); if (mEncoder != null && mEncoder.isEnabled()) { mEncoder.pause();