From cc709a87c71aec5618ae52ffd72eaf45bd92aa2d Mon Sep 17 00:00:00 2001 From: liuguijing <1440265357@qq.com> Date: Thu, 17 Apr 2025 20:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AFrtsp=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZLMediaKit/server/main.cpp | 6 +-- app/src/main/cpp/native-lib.cpp | 4 +- .../java/com/xypower/mplive/MainActivity.java | 44 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ZLMediaKit/server/main.cpp b/ZLMediaKit/server/main.cpp index a134fb1..9ef3859 100644 --- a/ZLMediaKit/server/main.cpp +++ b/ZLMediaKit/server/main.cpp @@ -312,7 +312,7 @@ int start_main(int argc,char *argv[]) { listen_ip = "0.0.0.0"; uint16_t shellPort = 0; // mINI::Instance()[Shell::kPort]; - uint16_t rtspPort = 0; // mINI::Instance()[Rtsp::kPort]; + uint16_t rtspPort = mINI::Instance()[Rtsp::kPort]; uint16_t rtspsPort = 0; // mINI::Instance()[Rtsp::kSSLPort]; uint16_t rtmpPort = mINI::Instance()[Rtmp::kPort]; uint16_t rtmpsPort = 0; // mINI::Instance()[Rtmp::kSSLPort]; @@ -402,7 +402,7 @@ int start_main(int argc,char *argv[]) { InfoL << "已启动http hook 接口"; try { - // rtsp服务器，端口默认554 [AUTO-TRANSLATED:07937d81] + // rtsp服务器，端口默 认554 [AUTO-TRANSLATED:07937d81] // rtsp server, default port 554 if (rtspPort) { rtspSrv->start(rtspPort, listen_ip); } // rtsps服务器，端口默认322 [AUTO-TRANSLATED:e8a9fd71] @@ -439,7 +439,7 @@ int start_main(int argc,char *argv[]) { if (rtcPort) { rtcSrv_udp->start(rtcPort, listen_ip);} if (rtcTcpPort) { rtcSrv_tcp->start(rtcTcpPort, listen_ip);} - + #endif//defined(ENABLE_WEBRTC) #if defined(ENABLE_SRT) diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp index 8fe85ff..71355d4 100644 --- a/app/src/main/cpp/native-lib.cpp +++ b/app/src/main/cpp/native-lib.cpp @@ -187,9 +187,9 @@ JNI_API(jboolean, startServer, jstring ini_dir){ mINI::Instance()["http.port"] = 8080; mINI::Instance()["http.sslport"] = 8443; mINI::Instance()["rtsp.port"] = 8554; - mINI::Instance()["rtsp.port"] = 0; +// mINI::Instance()["rtsp.port"] = 0; mINI::Instance()["rtsp.sslport"] = 8332; - mINI::Instance()["rtsp.sslport"] = 0; +// mINI::Instance()["rtsp.sslport"] = 0; mINI::Instance()["general.enableVhost"] = 0; for (auto &pr : mINI::Instance()) { //替换hook默认地址 diff --git a/app/src/main/java/com/xypower/mplive/MainActivity.java b/app/src/main/java/com/xypower/mplive/MainActivity.java index 6872acb..619e7ec 100644 --- a/app/src/main/java/com/xypower/mplive/MainActivity.java +++ b/app/src/main/java/com/xypower/mplive/MainActivity.java @@ -195,28 +195,28 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL if (autoStart != 0) { startRTMPServer(); - mHandler.postDelayed(new Runnable() { - @Override - public void run() { -// rtmpUrl = "rtmp://61.169.135.146/live/0"; - 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); - 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); - mPublisher.switchCameraFace(cameraId, rotation); - } - }, 500); +// mHandler.postDelayed(new Runnable() { +// @Override +// public void run() { +//// rtmpUrl = "rtmp://61.169.135.146/live/0"; +// 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); +// 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); +// mPublisher.switchCameraFace(cameraId, rotation); +// } +// }, 500); } else { mPublisher.switchCameraFace(cameraId, rotation); }