Commit Graph

623 Commits

Author SHA1 Message Date
xia-chu
f524a0ebbd 配置文件auto_close开启后也触发无人观看hook(不处理回复)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2025-08-23 10:43:32 +08:00
yingxiaodong
8f3c01043f
问题修正:解决loadMP4File崩溃问题时,引入的getOwnerPoller失败 (#4390)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2025-08-11 20:35:10 +08:00
xia-chu
57fede9508 修复编译警告
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-08-09 15:42:28 +08:00
yingxiaodong
d2e099bd23
BUG修正:loadMP4File播放文件时,无人观看触发关闭,导致程序崩溃 (#4387)
关闭文件播放的处理与文件播放动作不在一个线程,导致崩溃。
2025-08-09 14:37:54 +08:00
dsjing
87d84c47fe
修正ENABLE_RTPPROXY未启用时编译失败问题 (#4384) 2025-08-09 14:24:23 +08:00
xia-chu
c9a0025620 新增startRecordTask接口,支持录制事件视频
用户可以录制当前时间前后一定时间内的视频,配置文件gop_cache设置较大时历史视频才能录全
2025-08-02 21:00:30 +08:00
xia-chu
88ef00e429 音视频时间戳相差太大时强制同步 2025-08-02 21:00:30 +08:00
sbkyy
6ccbd3aafb
rtp级联网络慢时默认不限制源端接收网速 (#4359) 2025-07-26 15:44:29 +08:00
PioLing
fb2a3f5179
修复无人观看关闭流相关bug (#4334)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2025-07-02 14:58:12 +08:00
xia-chu
f0bc7a75aa 确保断连续推功能开启后流能正常强制关闭 (#4287)
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-06-29 18:10:00 +08:00
xia-chu
9a7cca1ad9 paced_sender逻辑新增音视频包排序功能
用于矫正音视频包时间戳交织性
2025-06-29 18:00:04 +08:00
xia-chu
18ca4cf48f 优化音视频时间戳同步逻辑 2025-06-29 17:55:17 +08:00
xia-chu
a9fe5d6f42 新增帧合并开关,优化国标流秒开速度
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-06-29 10:56:05 +08:00
xia-chu
9e6b33b02e rtp tcp级联速度太慢时主动限制上游接收速度
防止发送速度跟不上接受速度导致发送超时
2025-06-29 10:56:05 +08:00
Haibo Chen(陈海博)
6e125d02dc
Fix typo (#4307) 2025-06-07 15:00:06 +08:00
PioLing
7b1f8fedac
Add network traffic statistics (#4239)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Co-authored-by: xiongguangjie <xiong_panda@163.com>
Co-authored-by: xia-chu <771730766@qq.com>
2025-05-02 16:23:25 +08:00
xia-chu
11d1b849ec startSendRtp、startRecord接口支持缓存多个gop (#4180)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2025-03-07 23:40:50 +08:00
xiongguangjie
2a85dffdf9
on_play/on_publish hook 新增protocol字段 (#4133 #4143)
对于webhook  涉及到media info的相关信息,增加protocol 的字段,表明是基于什么协议传输的
2025-02-13 15:18:47 +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
xia-chu
ef11c66fb8 新增语音对讲接口(startSendRtpTalk) 2024-11-09 19:29:04 +08:00
xia-chu
4c90a1a95b Instantly enable recording support for GOP caching 2024-10-18 22:22:13 +08:00
xia-chu
e4025a6811 Improve timestamp corrector 2024-10-13 00:23:34 +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
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
wEnchanters
bd40c24745
startSendRtp接口支持指定接收流的app和vhost参数 (#3841) 2024-08-22 19:50:29 +08:00
xia-chu
da704ab2f1 更新并适配ZLToolKit 2024-08-04 20:46:05 +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
mtdxc
d735aa1797
Media tuple refactor (#3715)
Co-authored-by: cqm <cqm@97kid.com>
2024-07-14 09:32:41 +08:00
zhang2349
c72e576420
rtp server新增支持自定义vhost和app名称 (#3693)
代码来自https://github.com/ZLMediaKit/ZLMediaKit/pull/3446 , 增加了vhost
2024-07-09 10:42:10 +08:00
xia-chu
5470049076 精简ProtocolOption相关代码 2024-06-28 19:40:46 +08:00
Lidaofu
5a717186dd feat: 增加拉流代理rtsp时提供倍速功能支持 (#3669)
Co-authored-by: lidaofu <lidf@ahtelit.com>
2024-06-28 16:08:08 +08:00
PioLing
f9f386bc23
修改完善MediaSource事件拦截器 (#3622) 2024-06-14 12:59:02 +08:00
xiongziliang
77d2df1695 移除RtpSelector相关逻辑,优化代码结构 2024-06-09 10:52:10 +08:00
xiongziliang
4cd735f61d 编码H264时支持时间戳透传,修复时间戳相关问题 2024-06-02 13:34:51 +08:00
KkemChen
373620cfc6
feat: add broadcast event for player count change (#3562) 2024-05-23 10:30:11 +08:00
xia-chu
bbdbd6a3e0 feat: Using kBeatIntervalMS option for rtsp heartbeat interval time and add kRtspBeatType for setting rtsp heartbeat type 2024-05-11 14:41:18 +08:00
xia-chu
664d0b67bc Add the listRtpSender http api 2024-04-21 11:31:43 +08:00
xia-chu
e4de454d5d Charset default to UTF-8 on Windows 2024-04-20 22:25:21 +08:00
xiongguangjie
d8cb75d387
Improve url encode and decode code add user pass encode decode methond (#3468)
去除url转义的冗余代码,添加用户名与密码的转义
2024-04-13 20:36:15 +08:00
xia-chu
af3ef996b0 Avoid build warnings in the main code 2024-03-30 14:59:28 +08:00
xia-chu
390c374086 Optimize the code
1. change param_strs to params
2. move params from MediaInfo to MediaTuple
3. passing MediaTuple as a parameter for some functions
2024-03-30 14:41:20 +08:00
Jacob Su
208f57e2cd
Fix macOS compile error by rename version.h -> ZLMVersion.h (#3411 #3410) 2024-03-24 17:18:18 +08:00
johzzy
029813402d
feat: update negotiateSdp and WebRtcArgs (#3371)
- update negotiateSdp
- update HttpAllArgs and alias
- update onRtcConfigure
- define setWebRtcArgs, handle set_webrtc_cands and setLocalIp

---------

Co-authored-by: xiongziliang <771730766@qq.com>
Co-authored-by: KkemChen <kkemchen@qq.com>
2024-03-23 22:46:30 +08:00
xia-chu
49ddde28c0 Refactor code 2024-03-22 20:50:07 +08:00
xia-chu
e972ec5a22 Remove deprecated code 2024-03-22 20:50:07 +08:00
xia-chu
1930d909f9 Fix the thread safety issue caused by poller thread switching when paced sender enabled 2024-03-16 21:53:30 +08:00
xiongguangjie
c9c2706843 avoid addstreamproxy rtsp user or pass contain + 2024-03-16 21:52:24 +08:00