THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,304 Commits 17 Branches 0 Tags 222 MiB
Commit Graph

2242 Commits

Author SHA1 Message Date
mtdxc d735aa1797
Media tuple refactor (#3715) 
Co-authored-by: cqm <cqm@97kid.com>
 2024-07-14 09:32:41 +08:00
张传峰 0eb38635ce
国标推流一直打印 'Already existed a same track' (#3713) 
https://github.com/ZLMediaKit/ZLMediaKit/pull/3689 
https://github.com/ZLMediaKit/ZLMediaKit/issues/3702#issuecomment-2222326053
 2024-07-14 09:27:14 +08:00
waken 9727e03c2e
修复创建单端口udp_server自定义vhost、app为空问题 (#3714 #3702) 2024-07-14 09:26:29 +08:00
PioLing 3e7e1a317e
Fix the bug in Win32 that fails to retrieve sizes larger than 4GB. (#3707 #3702) 2024-07-10 10:43:14 +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 b4fecdc929 防止对象析构时抛异常导致的崩溃 2024-07-05 21:06:11 +08:00
zhang2349 6c3d362b5a
修正finish是true但track不支持，没有执行addTrackCompleted的问题 (#3689) 
加快track类型不支持时媒体的注册速度
 2024-07-05 20:55:36 +08:00
xiongguangjie 5b4ec8415d
Fix dahua nvr rtsp record compatible bug (#3677 #3632) 2024-07-05 20:54:06 +08:00
xiongziliang 8390d72b78 优化on_publish hook响应太慢导致rtp推流无法秒开的问题 
由限制缓存个数改成限制缓存时间长度(10秒)
 2024-06-28 22:40:44 +08:00
xia-chu 5470049076 精简ProtocolOption相关代码 2024-06-28 19:40:46 +08:00
sgzed cf6066b36e bugfix: 修复所有Player的删除器使用同一个线程进行析构导致崩溃的问题 (#3672) 
Player的删除器release_func是static类型，weak_poller不会更新了。后面析构使用的就不是正确的poller线程了。
 2024-06-28 16:08:10 +08:00
Lidaofu 5a717186dd feat: 增加拉流代理rtsp时提供倍速功能支持 (#3669) 
Co-authored-by: lidaofu <lidf@ahtelit.com>
 2024-06-28 16:08:08 +08:00
xiongziliang 2bf16e63e1 保证rtp服务器tcp模式下线程安全 2024-06-22 13:04:06 +08:00
Xiaofeng Wang 84dbe4b076
Send config frames once before sending DirectProxy RTP packets (#3611) 2024-06-16 09:37:33 +08:00
PioLing f9f386bc23
修改完善MediaSource事件拦截器 (#3622) 2024-06-14 12:59:02 +08:00
PioLing d34da06766
bugfix: 修复rtp推流观看人数统计异常的问题 (#3620 #3615) 2024-06-13 11:41:22 +08:00
xia-chu 8159f4e085 bugfix: 修复rtp服务器单端口tcp模式下访问空指针崩溃的问题 2024-06-12 20:18:50 +08:00
xiongziliang 77d2df1695 移除RtpSelector相关逻辑，优化代码结构 2024-06-09 10:52:10 +08:00
zwcarl 9a5fdd3dac
修复组播bug (#3602) 
当多个客户端拉同一个组播源时，如果此时源被析构，会偶现使用该源的组播对象没有被析构的情况，在RtpMultiCaster的_rtp_reader->setDetachCB回调函数中，先移除该组播对象再通知上层session可以解决此问题

---------

Co-authored-by: zhengwang <carl.zheng@lednets.com>
 2024-06-09 10:42:02 +08:00
xiongziliang 4cd735f61d 编码H264时支持时间戳透传，修复时间戳相关问题 2024-06-02 13:34:51 +08:00
xiongziliang 189b02e400 解析rtp时，兼容rtsp服务端发送缓冲区溢出覆盖的bug 2024-06-02 13:11:45 +08:00
KkemChen 373620cfc6
feat: add broadcast event for player count change (#3562) 2024-05-23 10:30:11 +08:00
admin 472d7d1e4f 兼容rtsp服务端发送缓冲区溢出覆盖的bug 2024-05-15 14:31:36 +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
xiongguangjie 1c89950ebe
Fix record info size to int64 (#3527) 2024-05-11 10:49:33 +08:00
yanggs 046aaa3498
修复拉取指定流时时长信息丢失的问题 (#3500) 2024-05-01 13:19:47 +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
xia-chu ff70ef233c Fix bug where ts files are not written into m3u8 file during HLS playback. 2024-04-20 20:00:25 +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
xiongziliang 3e13e69724 BufFix: avoid may change data in splitter 2024-03-24 22:01:56 +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 b05f515ccc Revert "Fix the issue of failing to push streams to FMS 3.0 server" 
This reverts commit 3b7f16b755.
 2024-03-22 20:50:07 +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 5036aa5ec5 BugFix: crashes when exceptions are thrown during destruction #3402 2024-03-22 20:50:07 +08:00
百鸣 ff43fa5075
Fix the issue of abnormal timestamps during MP4 recording. (#3363) 
Co-authored-by: xingqiao <xingqiao@uni-ubi.com>
 2024-03-16 22:01:06 +08:00
haorui wang 3b7f16b755
Fix the issue of failing to push streams to FMS 3.0 server. (#3362) 
[how]
1. AMF 为简单类型时填插 AMF Null (参考 OBS 以及实际测试)
2. createStream 前附加 releaseStream 和 FCPublish, 兼容旧 FMS3.0
3. 正确处理 RTMP Header fmt 为 1 和 2 的业务逻辑
 2024-03-16 21:58:33 +08:00
xia-chu 50f65c4ba4 Random port pool ensures that both UDP and TCP modes are available simultaneously 2024-03-16 21:53:30 +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
xiongguangjie af155ef87a no track throw error avoid addstreamproxy already exist 2024-03-16 21:52:24 +08:00
jamesZHANG500 03c93d0b23
Add config for save fmp4 record files (#3356) 2024-03-10 16:19:02 +08:00
xiongguangjie fe61b572e0
Fix hls fmp4 clear cache bug (#3355) 
Fix hls fmp4 clear cache delete init.mp4 result in play failed for #3348
 2024-03-08 11:04:59 +08:00
waken 79b2aa6adc
openRtpServer接口增加单视频参数，加快单视频流注册速度 (#3342) 
only_audio -> only_track
 2024-03-05 17:06:31 +08:00
张传峰 ffdc13bfb9
RTP proxy通过UDP收流，调整udp recv socket buffer size成配置 (#3336) 
国标推流有些情况需要UDP方式接收流，端口复用同一个UDP端口可能需要根据服务器性能
 2024-03-05 10:42:22 +08:00
johzzy f49aed7a32
srt optimization code for query poller (#3334) 
- add querySrtTransport, improve code.
- update SrtTransportManager key
- fix some warning
 2024-03-02 18:25:32 +08:00