Commit Graph

2294 Commits

Author SHA1 Message Date
yanggs
69e4c127bc
Fix compile error when config with -DENABLE_SRT=OFF (#4132) 2025-02-11 13:23:24 +08:00
PioLing
a8507d9ecc
Optimize the code related to decoding and screenshot (#4106)
Co-authored-by: xia-chu <771730766@qq.com>
2025-01-19 20:18:32 +08:00
N.z
83a622fa25
Ensure play url is valid(#4114)
Play url could be empty.
2025-01-19 18:35:22 +08:00
Dary
f3026f5df0
适配FFmpeg7.1 (#4102)
ffmpeg中FF_API_OLD_CHANNEL_LAYOUT系列API在2024年3月的提交中已经正式移除了,对应release7.0,使用ffmpeg7.0及以上版本编译zlm会报错。
2025-01-12 10:16:45 +08:00
xiongguangjie
ac6bb9b332
Improve srt print and check pusher (#4113) 2025-01-12 10:01:35 +08:00
PioLing
9863f9c160
Add logo and version information to exe on windows (#4093) 2025-01-03 11:33:35 +08:00
baigao-X
1c8ed1c55a
Add srt caller mode and stream encryption support. (#4088)
Add srt caller mode and stream encryption support.
1. Support srt caller mode, realize srt proxy pull stream proxy push
stream;
url parameter format such as: srt://127.0.0.1:9000?streamid=#!
::r=live/test11
2. Support srt stream encrypted transmission in caller and listener
mode.

---------

Co-authored-by: xiongguangjie <xiong_panda@163.com>
2024-12-28 20:21:29 +08:00
xia-chu
0bbcbb9907 修复某些不规范流不注册的问题 2024-12-21 18:47:33 +08:00
mtdxc
cffd98042b
代码优化: _last_seq_out -> next_seq, (#4069) 2024-12-20 11:15:15 +08:00
xia-chu
fa9db13bdb 修复推流器相关bug 2024-12-05 21:14:13 +08:00
Dw9
2bf85eb8ff
Add mp3_plugin, support rtsp with mp3 (#4048)
增加mp3_plugin, 解决rtmp推流转rtsp无法播放问题
ref: https://datatracker.ietf.org/doc/html/rfc2250#section-3.5
2024-12-03 10:40:24 +08:00
xia-chu
8a27e11c4c 防止ps/ts不支持编码类型时警告日志打印 2024-12-01 10:26:50 +08:00
xia-chu
8cf8e4ed5f 防止rtmp打包不支持的编码类型时频繁打印警告日志 2024-12-01 10:20:01 +08:00
xia-chu
aa56576b0e 修复默认音频参数相关bug 2024-11-30 10:54:45 +08:00
xia-chu
d1f3961326 完善rtp服务器对各编码类型es流的支持 2024-11-30 08:50:07 +08:00
xia-chu
892108d6ba 新增若干音视频编码类型的默认实现
部分支持VP8/VP9/AV1/JPEG/MP3/H266/ADPCM/SVAC/G722/G723/G729
2024-11-30 08:23:10 +08:00
xia-chu
87b42ab492 优化代码
除1024改成右移10位
2024-11-29 23:51:34 +08:00
xia-chu
02a0b0402a 修复rtp单端口模式主动关闭时线程安全问题 2024-11-29 23:38:10 +08:00
xia-chu
f5d5b71731 修复FrameMerger输入不可缓存帧相关bug 2024-11-29 20:15:40 +08:00
xiongguangjie
8868320301
Add xr targetbitrate process and update js demo sdk (#4031)
rtc 增加对于rtcp xr target bitrate 的解析,参照
https://webrtc.googlesource.com/src/+/refs/heads/main/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc

zlmrtcclient.js 更新,修复推屏幕流失败的问题
2024-11-21 14:17:02 +08:00
ss002012
226b87a633
优化rtsp ntp时间戳,防止音视频不同步( #4017 #4018)
rtp时间戳可能被截断,ntp时间戳生成时优先使用未截断的原始时间戳,防止音视频不同步
2024-11-18 14:08:53 +08:00
xiongguangjie
51f49d3a89
Fix mp4 record segment bug (#4008 #4007) 2024-11-09 19:33:36 +08:00
286897655
8e823b3b74
提升rtsp协议兼容性 (#4003)
海康解码器播放rtsp流url带了?key=value参数,SETUP时会带着这些参数,导致获取trackid失败
2024-11-09 19:32:18 +08:00
xia-chu
ef11c66fb8 新增语音对讲接口(startSendRtpTalk) 2024-11-09 19:29:04 +08:00
mtdxc
901c381300
新增获取推流推流代理列表和ffmpeg源列表接口 (#3992) 2024-11-01 10:47:18 +08:00
wuxingzhong
6729257eab
修复时间戳回退导致超大mp4切片问题 (#3991)
当出现dts回退时,应该取frame->dts(), 即MIN, 非MAX
2024-10-31 20:11:34 +08:00
xiongguangjie
cc590254a6 fix compile error for ci 2024-10-28 10:59:37 +08:00
xia-chu
18d5fb71f3 增强hls点播功能,每个切片文件夹生成一个m3u8索引文件 2024-10-26 16:42:06 +08:00
xia-chu
4c90a1a95b Instantly enable recording support for GOP caching 2024-10-18 22:22:13 +08:00
xia-chu
61a93fab6a MP4 reader supports loading multi files 2024-10-13 02:09:39 +08:00
xia-chu
e4025a6811 Improve timestamp corrector 2024-10-13 00:23:34 +08:00
xiongguangjie
6b2fcf7943
Fix the issue where the hls-fmp4 do not flush data in single audio cases (#3935 #3937) 2024-09-29 11:55:58 +08:00
xiongguangjie
de7afaf992
Avoid negative PTS in the RTSP protocol (#3929 #3815)
Optimaztion for issue #3815 ffmpeg rtsp pull stream has negative pts
2024-09-26 10:59:41 +08:00
Dw9
f3e2a29cbd
Fix crashes where iterators may be invalid (#3920)
Fix: #3885
2024-09-19 20:16:16 +08:00
alex
4152dcd409
AI automatically translates all comments in the code into English (#3917) 2024-09-19 14:53:50 +08:00
Dw9
046de691cb
Fix the issue of RTP sorting cache crashing when the sequence is reset (#3915) 2024-09-18 19:09:14 +08:00
xiongguangjie
8f03105baa
Fix bug #3894 of rtsp over http (#3903) 2024-09-17 09:44:22 +08:00
Talus
7c914666f2
Fix issue where when RTP timestamp does not change and packet loss occurs, the rtp parser's CommonRtpDecoder never outputs again (#3891)
Co-authored-by: TalusL <liangzhuohua@genew.com>
2024-09-13 17:44:30 +08:00
Talus
e2ac6dc176
Accelerate the ready speed of certain media that actually only have a single video track but the metadata contains an audio track (#3885)
加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度,比如GB28181 PS流
---------

Co-authored-by: TalusL <liangzhuohua@genew.com>
2024-09-13 14:59:46 +08:00
老衲不出家
e322db0a04 兼容seq计数器重置不规范的rtp流 (#3860)
rtp seq在重置回退时,之前的逻辑会一直丢数据,修改后将兼容这种不规范的rtp流。
2024-09-05 17:28:33 +08:00
wEnchanters
bd40c24745
startSendRtp接口支持指定接收流的app和vhost参数 (#3841) 2024-08-22 19:50:29 +08:00
xiongguangjie
cb1821cf88
Fix addStreamProxy retry bug (#3830 #3810 #3837)
Fix addStreamProxy retry bug( protocol option overwrite once play
success ), result in some media source not register; it's found by the
issue #3830 #3810
2024-08-22 11:11:04 +08:00
xiongguangjie
ba1a88f202
修复ffmpeg5以上默认不合并帧导致解码失败的bug (#3809 #3794)
FFmpegDecoder 默认合并帧,ffmpeg 5以上不支持将不完整的帧送入解码器中,根据 issue #3794 做出修改
2024-08-10 11:09:54 +08:00
xia-chu
da704ab2f1 更新并适配ZLToolKit 2024-08-04 20:46:05 +08:00
xiongguangjie
47b8435d7c
修复addStreamProxy拉流代理同协议下开关问题 (#3779 #3770) 2024-08-02 21:32:32 +08:00
u7ko4
e3cad7f8fa
支持绑定到指定网卡 (#3760) 2024-08-01 11:03:26 +08:00
xia-chu
81aef25583 整理startSendRtp相关接口,新增支持udp被动模式
startSendPassive接口指定is_udp为1时则为开启udp被动模式, 被动模式下需要对方先发数据给zlmediakit,然后才能回复rtp数据;
同时在被动模式指定src_port时,不再等待对方连接成功后再返回(而是直接返回成功和端口号,失败通知请监听on_send_rtp_stopped hook)。
2024-07-28 23:37:13 +08:00
xiongguangjie
8398ae17e4
compatible rtsp sdp parse no samplerate for audio (#3740)
兼容rtsp sdp协商中未声明采样率但是可以通过a 字段中fmtp中有config中解析出来的情况
2024-07-21 20:43:52 +08:00
xia-chu
9463d1291d 修复编译警告 2024-07-21 19:47:36 +08:00
xia-chu
66065f5359 修复rtp推流协议为空的bug 2024-07-21 19:17:12 +08:00