From 9f31e79605fa64ff781debd9a1b85a55188ed0de Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 7 Nov 2024 22:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=94=B1=E8=A3=85=E7=BD=AE=E7=AB=AF?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0RTMP=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../release/android/RelWithDebInfo/config.ini | 17 ++- .../RelWithDebInfo/www/webrtc/index.html | 5 + app/src/main/AndroidManifest.xml | 2 +- .../java/com/xypower/mpremote/AdbManager.java | 107 ++++++++++++++++++ .../com/xypower/mpremote/DeviceActivity.java | 45 +++----- .../com/xypower/mpremote/MainActivity.java | 2 + .../com/xypower/mpremote/StreamActivity.java | 83 ++------------ 7 files changed, 149 insertions(+), 112 deletions(-) create mode 100644 app/src/main/java/com/xypower/mpremote/AdbManager.java diff --git a/ZLMediaKit/release/android/RelWithDebInfo/config.ini b/ZLMediaKit/release/android/RelWithDebInfo/config.ini index 95d3fa3..ea241a6 100644 --- a/ZLMediaKit/release/android/RelWithDebInfo/config.ini +++ b/ZLMediaKit/release/android/RelWithDebInfo/config.ini @@ -121,6 +121,9 @@ mediaServerId=your_server_id #最多等待未初始化的Track时间，单位毫秒，超时之后会忽略未初始化的Track wait_track_ready_ms=10000 +#最多等待音频Track收到数据时间，单位毫秒，超时且完全没收到音频数据，忽略音频Track +#加快某些带封装的流metadata说明有音频，但是实际上没有的流ready时间（比如很多厂商的GB28181 PS） +wait_audio_track_data_ms=1000 #如果流只有单Track，最多等待若干毫秒，超时后未收到其他Track的数据，则认为是单Track #如果协议元数据有声明特定track数，那么无此等待时间 wait_add_track_ms=3000 @@ -128,6 +131,8 @@ wait_add_track_ms=3000 unready_frame_cache=100 #是否启用观看人数变化事件广播，置1则启用，置0则关闭 broadcast_player_count_changed=0 +#绑定的本地网卡ip +listen_ip=:: [hls] #hls写文件的buf大小，调整参数可以提高文件io性能 @@ -369,13 +374,13 @@ start_bitrate=0 max_bitrate=0 min_bitrate=0 -#nack接收端 -#Nack缓存包最早时间间隔 -maxNackMS=5000 -#Nack包检查间隔(包数量) -rtpCacheCheckInterval=100 +#nack接收端, rtp发送端，zlm发送rtc流 +#rtp重发缓存列队最大长度，单位毫秒 +maxRtpCacheMS=5000 +#rtp重发缓存列队最大长度，单位个数 +maxRtpCacheSize=2048 -#nack发送端 +#nack发送端，rtp接收端，zlm接收rtc推流 #最大保留的rtp丢包状态个数 nackMaxSize=2048 #rtp丢包状态最长保留时间 diff --git a/ZLMediaKit/release/android/RelWithDebInfo/www/webrtc/index.html b/ZLMediaKit/release/android/RelWithDebInfo/www/webrtc/index.html index 803ee2f..041e026 100644 --- a/ZLMediaKit/release/android/RelWithDebInfo/www/webrtc/index.html +++ b/ZLMediaKit/release/android/RelWithDebInfo/www/webrtc/index.html @@ -3,6 +3,11 @@ ZLM RTC demo + +