diff --git a/app/src/main/java/com/xypower/mplive/MainActivity.java b/app/src/main/java/com/xypower/mplive/MainActivity.java index 0db212e..1230b21 100644 --- a/app/src/main/java/com/xypower/mplive/MainActivity.java +++ b/app/src/main/java/com/xypower/mplive/MainActivity.java @@ -174,7 +174,8 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL mPublisher.setVideoHDMode(); - cameraId = intent.getIntExtra("cameraId", 1); + + cameraId = intent.getIntExtra("cameraId", 0); // mPublisher.startCamera(); mCameraView.setCameraCallbacksHandler(new SrsCameraView.CameraCallbacksHandler() { @@ -197,6 +198,7 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL SharedPreferences.Editor editor = sp.edit(); editor.putString("rtmpUrl", rtmpUrl); editor.apply(); + efu.setText(rtmpUrl + "rotation= " + rotation + " cameraid=" + cameraId + " auto=" + autoStart); // efu.setText(rtmpUrl + " cameraid=" + cameraId + " auto=" + autoStart); efu.setText(rtmpUrl); mPublisher.startPublish(rtmpUrl); @@ -586,17 +588,17 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL @Override public void onRecordPause() { - // Toast.makeText(getApplicationContext(), "Record paused", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "Record paused", Toast.LENGTH_SHORT).show(); } @Override public void onRecordResume() { - // Toast.makeText(getApplicationContext(), "Record resumed", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "Record resumed", Toast.LENGTH_SHORT).show(); } @Override public void onRecordStarted(String msg) { - // Toast.makeText(getApplicationContext(), "Recording file: " + msg, Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "Recording file: " + msg, Toast.LENGTH_SHORT).show(); } @Override 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 56c65d0..30d11b9 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 @@ -412,6 +412,60 @@ public class GPUImageFilter { } } +// //设置纹理旋转角度 +// 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. +// 0.0f, 0.0f, // Bottom right. +// 1.0f, 1.0f, // Top left. +// 1.0f, 0.0f // Top right. +// }; +// final float TEX_COORD_90[] = { +////二号摄像头正 +// 1.0f, 1.0f, // Bottom left. +// 0.0f, 1.0f, // Bottom right. +// 1.0f, 0.0f, // Top left. +// 0.0f, 0.0f // Top right. +// }; +// final float TEX_COORD_180[] = { +////三号摄像头正 +// 1.0f, 0.0f, // Bottom left. +// 1.0f, 1.0f, // Bottom right. +// 0.0f, 0.0f, // Top left. +// 0.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. +// }; +// //纹理坐标 +// 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 { +// TEX_COORD = TEX_COORD0; +// } +// +// } + + //设置纹理旋转角度 public void setOrtation(int rotation) { @@ -423,42 +477,40 @@ public class GPUImageFilter { // }; final float TEX_COORD0[] = { -//1号摄像头 正 + 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_90[] = { 0.0f, 1.0f, // Bottom left. 0.0f, 0.0f, // Bottom right. 1.0f, 1.0f, // Top left. 1.0f, 0.0f // Top right. }; - final float TEX_COORD_90[] = { -//二号摄像头正 + final float TEX_COORD_180[] = { 1.0f, 1.0f, // Bottom left. 0.0f, 1.0f, // Bottom right. 1.0f, 0.0f, // Top left. 0.0f, 0.0f // Top right. }; - final float TEX_COORD_180[] = { -//三号摄像头正 + + final float TEX_COORD_270[] = { 1.0f, 0.0f, // Bottom left. 1.0f, 1.0f, // Bottom right. 0.0f, 0.0f, // Top left. 0.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. - }; //纹理坐标 TEX_COORD = TEX_COORD0; if (rotation == 0) { TEX_COORD = TEX_COORD0; } else if (rotation == 90) { - TEX_COORD = TEX_COORD_270; + TEX_COORD = TEX_COORD_90; } else if (rotation == 180) { TEX_COORD = TEX_COORD_180; } else if (rotation == 270) { - TEX_COORD = TEX_COORD_90; + TEX_COORD = TEX_COORD_270; } else { TEX_COORD = TEX_COORD0; }