Pre Merge pull request !45 from 山海守门人/dev260107_2

增加mp4最大时长设置的容错处理，确保流时长超过时不会导致文件切片生成失败
优化视频下载时长设置，增加１０秒容错
2026-06-29 21:47:50 +08:00 · 2026-05-09 04:20:37 +00:00 · 2026-05-09 12:20:15 +08:00 · 2026-05-09 10:21:24 +08:00 · 2026-01-07 07:51:54 +08:00
2 changed files with 5 additions and 2 deletions
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -59,7 +59,7 @@ services:
    networks:
      - media-net
    ports:
-     #- "6080:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
+     - "80:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
     #- "4443:443/tcp"     # [播流]HTTPS 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
      - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp"   # [收流]RTMP  
      - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/udp"   # [收流]RTMP  
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java
@ -409,7 +409,10 @@ public class RtpServerServiceImpl implements IReceiveRtpServerService {
        hookResultForOnPublish.setStream_replace(streamReplace);
        hookResultForOnPublish.setEnable_audio(enableAudio);
        hookResultForOnPublish.setEnable_mp4(enableMp4);
-        hookResultForOnPublish.setMp4_max_second(mp4MaxSecond);
+        if (mp4MaxSecond != null) {
+            // mp4MaxSecond 需要比实际的流时长略长一些，避免因为流时长超过mp4MaxSecond而生成文件切片
+            hookResultForOnPublish.setMp4_max_second(mp4MaxSecond + 10);
+        }

        String key = String.format("%s:%s", VideoManagerConstants.RTP_AUTHENTICATE, streamId);
        // 存储认证信息，过期时间为60秒， 过期则无法通过认证
Author	SHA1	Message	Date
山海守门人	41f9e12e90	Pre Merge pull request !45 from 山海守门人/dev260107_2	2026-05-09 04:20:37 +00:00
lin	761c3082c9	增加mp4最大时长设置的容错处理，确保流时长超过时不会导致文件切片生成失败	2026-05-09 12:20:15 +08:00
lin	e5fe596ee3	优化视频下载时长设置，增加１０秒容错	2026-05-09 10:21:24 +08:00
紫穹	8e32f17e6e	fix: 添加80端口映射，否则无法播放推送的流	2026-01-07 07:51:54 +08:00