aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-23 01:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,756 Commits 16 Branches 0 Tags 156 MiB
60ef4f50c8
Commit Graph

1971 Commits

Author SHA1 Message Date
renlu
60ef4f50c8 修改不录像的设备的无人观看时长为130秒，以后就不需要改配置文件了。 2022-12-16 10:12:36 +08:00
renlu
272b65bb4e 无人观看断流的时候，继续判断是否在录像，如果在录像，不断流 2022-12-09 11:24:17 +08:00
renlu
fe22ed258a 添加设备是否正在录像的日志。 2022-12-08 16:53:42 +08:00
renlu
7c05c474e9 去掉读m3u8文件，并删除直播的三个ts文件的操作。 2022-12-08 10:21:47 +08:00
renlu
c28e96c3af 从直播到录像，不删除直播的8个切片。 2022-12-08 09:47:33 +08:00
renlu
0d40bf9272 去掉延时30s再删除直播的ts的操作。从直播到录像直接删除直播的8个ts切片。 2022-12-07 08:52:01 +08:00
renlu
696e28765b 添加配置项 非录像状态下的无人观看延时时长。 2022-12-06 14:26:57 +08:00
renlu
7801467e36 修改文件编码各位为UFT-8 BOM 2022-12-02 11:01:15 +08:00
yinxiang
fd040192b1 Merge branch 'v1.1.2_20221130' of gitee.com:gwds_1/ZLMediaKit into master 
Signed-off-by: yinxiang <9886575+renluyx@user.noreply.gitee.com>
 2022-12-02 02:31:27 +00:00
monktan89
68ea5465cc 修复addStreamProxy后，马上startSendRtp，触发的无人观看事件回调是MediaSourceNull的信息，导致无法关闭流bug(#2120) 2022-11-29 11:33:16 +08:00
mtdxc
754073918a
Header refactor (#2115) 
* 优化MultiMediaSourceMuxer头文件包含

* 将MediaSinkDelegate和Demux移到MediaSink中

* MediaSource头文件重构, 独立出PacketCache.h
精简Frame和Track的头文件

* Rtmp头文件重构

* Rtsp头文件重构

* webrtc头文件重构

* 规范.h头文件包含，并将其移到.cpp中:
- 尽量不包含Common\config.h
- Util\File.h
- Rtsp/RtspPlayer.h
- Rtmp/RtmpPlayer.h

* 删除多余的Stamp.h和Base64包含
 2022-11-29 11:07:13 +08:00
renlu
99e420d784 修复析构中调用getOwnerPoller抛异常导致崩溃的bug 2022-11-28 16:47:21 +08:00
renlu
64ee0bcaf2 修改Bug: 从直播到录像，缺少第一个ts文件。 2022-11-28 16:31:00 +08:00
xiongziliang
50fa671564 修复析构中调用getOwnerPoller抛异常导致崩溃的bug:#2117 2022-11-26 10:16:47 +08:00
yinxiang
b940e13d2d Merge branch 'v1.1.1_20221122' of gitee.com:gwds_1/ZLMediaKit into master 
Signed-off-by: yinxiang <9886575+renluyx@user.noreply.gitee.com>
 2022-11-22 03:17:32 +00:00
renlu
5364d8a001 删除直播生成的8个ts文件。以免多次播放导致ts文件累积过多占用内存。 2022-11-21 17:10:36 +08:00
ziyue
188ee1f61a 消除编译警告 2022-11-19 09:37:49 +08:00
ziyue
68948288e0 TcpSession/UdpSession统一为Session类 2022-11-19 09:33:10 +08:00
ziyue
fc433de9ac 适配webrtc AV1编码: #2091 2022-11-18 16:47:02 +08:00
ziyue
255ccb4265 精简rtp服务器相关代码 2022-11-18 16:43:00 +08:00
ziyue
df14924a99 优化rtmp服务器兼容性: #2078 2022-11-15 20:53:24 +08:00
ziyue
034e29b25a 修复rtsp basic鉴权相关bug: #2087 2022-11-15 20:52:27 +08:00
xiongguangjie
87353534af fix rtp server process removed server not clear 2022-11-14 14:04:57 +08:00
xiongziliang
9bb6a2f828 全面整理转协议相关配置文件 2022-11-12 23:56:28 +08:00
xiongziliang
946945ce7b 优化代码 
整理代码
 2022-11-12 22:06:09 +08:00
samosirl
6ffbcbfde5
优化Ehome协议兼容性 (#2063) 2022-11-12 21:03:54 +08:00
xiongziliang
b54f50c7c0 修复hls流注销时相关bug:#2082 2022-11-12 09:57:47 +08:00
夏楚
a37268f003 格式化代码 2022-11-12 01:52:49 +00:00
xiongguangjie
bc63142712 add rtp server timeout hook 2022-11-10 16:58:02 +08:00
Aven
af554bc376
update media-server (#2075) 
* fix c2065 and c2051 error on windows, and the head file mpeg-ts-proto.h is also deprecated

* update media-server to 357ef88
 2022-11-09 17:44:38 +08:00
xiongziliang
44fd6b86bc 完善版本信息 2022-11-06 00:38:14 +08:00
xiongziliang
0053148139 优化MultiMediaSourceMuxer相关代码 2022-11-05 20:47:33 +08:00
ziyue
2b804514e1 修复mp4点播流线程安全检查失败bug 2022-11-01 22:02:28 +08:00
ziyue
5877d3942e RtpServer确保超时回收 2022-11-01 17:54:41 +08:00
ziyue
2cdeddeb2c RtpServer支持udp与tcp模式并存 2022-11-01 17:27:27 +08:00
ziyue
60d96f4f3b 优化FrameDispatcher相关代码 2022-11-01 16:52:52 +08:00
ziyue
d04761c2c6 Merge branch 'FrameDispatcher_addDelegate_refactor' of github.com:mtdxc/ZLMediaKit 2022-11-01 16:36:43 +08:00
ziyue
bfe118d94e 修复RtpProcess析构导致的线程问题 2022-11-01 16:05:23 +08:00
ziyue
f5a032c9a0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-11-01 14:08:36 +08:00
cqm
dde352542b private FrameWriterInterfaceHelper 2022-11-01 12:03:49 +08:00
cqm
ac3d7bd21f add addDelegate with std::function, remove FrameWriterInterfaceHelper 2022-11-01 12:03:04 +08:00
ziyue
520945c2e9 提高线程安全性 2022-11-01 10:53:38 +08:00
xiongguangjie
d2c64b1f09 Merge remote-tracking branch 'origin/master' 2022-10-31 19:04:04 +08:00
xiongguangjie
613aae8bc3 rtp server only tcp mode is none use udp server 2022-10-31 18:47:42 +08:00
ziyue
918b1fce6c 修复hls/ts拉流崩溃问题：#2057 2022-10-30 23:50:20 +08:00
xiongziliang
9498b96b95 确保rtp推流线程安全性 2022-10-30 21:36:35 +08:00
xiongziliang
80eb6dc402 协议解析最大支持4MB分包: #2026 2022-10-29 22:57:32 +08:00
xiongguangjie
0a71e06d4a united some code style 2022-10-19 14:55:39 +08:00
xiongguangjie
7b87985f74 Merge remote-tracking branch 'origin/master' 2022-10-19 14:27:49 +08:00
xiongguangjie
0d2e035215 rtsp and rtp h264 lowlatency mode config 2022-10-19 14:20:53 +08:00