Commit Graph

1400 Commits

Author SHA1 Message Date
ziyue
3862c8f1da 删除多余行 2021-06-24 17:53:37 +08:00
ziyue
307be4339f Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test 2021-06-23 17:32:09 +08:00
ziyue
8717cd2f3d 优化代码 2021-06-23 11:09:53 +08:00
ziyue
d9de40526d 解决开启rtp推流鉴权导致udp丢包的问题,提升GB28181推流秒开体验 2021-06-23 11:02:39 +08:00
ziyue
e8c9666af0 支持hls直播文件延时删除: #913 2021-06-23 10:30:58 +08:00
xiongziliang
ce2122d3b6 优化rtmp chunk相关处理代码 2021-06-22 10:39:16 +08:00
ziyue
510d908bc4 rtp服务器支持opus推流 2021-06-21 20:32:13 +08:00
ziyue
c90f348801 RTP服务器支持ES混合流, 同时新增H265/G711的支持 2021-06-21 20:00:58 +08:00
ziyue
caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-21 17:51:15 +08:00
xgj
2335043cdf drop SEI and AUD for h264 and h265 avoid sei as a frame 2021-06-18 15:19:21 +08:00
xgj
a6e9652da8 for h264/h265 judge a frame start more safe(h264 is first_mb_in_slice h265 is first_slice_segment_in_pic_flag) and for h265 only idr is key frame 2021-06-18 12:40:42 +08:00
xgj
3429690d75 for h264 pps sps aud sei not check first_mb_in_slice 2021-06-17 19:26:58 +08:00
xgj
1920802764 for h264 multi slice on frame compatibility 2021-06-17 18:08:35 +08:00
ziyue
f8467f21fb 推流失败时打印日志 2021-06-17 11:34:24 +08:00
ziyue
60a2346819 媒体源注销后不做无谓推流重试 2021-06-17 11:32:57 +08:00
ziyue
752590f804 完善addStreamPusherProxy相关功能并修复自动删除相关的bug 2021-06-17 11:01:14 +08:00
monktan
cd7ae27276 添加推流代理器 2021-06-16 19:40:08 +08:00
ziyue
fadef1cac3 完善添加track日志打印 2021-06-16 11:39:46 +08:00
ziyue
807f9626d5 webrtc新增对av1的支持 2021-06-16 11:14:10 +08:00
ziyue
a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
ziyue
14d70426ed 加快GB28181推流时注册速度 2021-06-16 10:26:17 +08:00
ziyue
a09de23271 修复调用mk_media_stop_send_rtp函数导致崩溃的bug 2021-06-16 10:14:24 +08:00
ziyue
4d0db1b7c1 兼容时间戳不规范的H265流:#894 2021-06-15 12:55:55 +08:00
ziyue
92f879d703 完善PlayerProxy关闭机制,重试次数超限后自动关闭 2021-06-09 15:01:45 +08:00
ziyue
ad2cd11eec 优化判断h265是否为关键帧的代码 2021-06-09 10:19:58 +08:00
baiyfcu
ca192a4286 H265 I帧多slice情况下导致花屏问题
H265 I帧分片多包情况下,GPO缓冲只保存了I帧最后一个分片导致花屏
2021-06-09 09:51:28 +08:00
ziyue
b0af056356 删除过多的日志 2021-06-08 21:06:14 +08:00
ziyue
55c2b08c57 rtsp播放器在udp情况下超时时间延长4倍(防止vlc超时) 2021-06-08 20:51:54 +08:00
ziyue
98dc9bc78e ssrc切换时间改为3秒:#899 2021-06-08 20:05:45 +08:00
ziyue
40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 17:52:44 +08:00
ziyue
6ccf512367 完善内存统计 2021-06-08 17:49:12 +08:00
ziyue
0593f65fcb 完善代码 2021-06-08 14:50:12 +08:00
ziyue
e88281b2ff 删除无效代码 2021-06-08 14:49:48 +08:00
ziyue
9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-06-08 14:41:52 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
c4817c6d5f GB28181单端口接收流支持多线程 2021-06-08 14:03:25 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xgj
8721c5a62b for joy4 rtmp push onMetaData compatibility 2021-06-08 10:07:51 +08:00
xgj
0f3a8f4a9d fix webrtc to rtmp multi slice on frame error 2021-06-07 17:32:28 +08:00
ziyue
8f62365847 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-26 10:43:52 +08:00
夏楚
3b4e7619ad
Merge pull request #865 from yapingcat/master
fix bug rtcp sr包的 ssrc 和rtp包中ssrc的不一致
2021-05-22 11:04:50 +08:00
xiongziliang
9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-05-22 10:25:05 +08:00
xiongziliang
975c11b74c 支持http响应无content-length字段的情况:#850 2021-05-22 10:22:56 +08:00
xiongziliang
7067472a18 转协议支持全局关闭音频:#883 2021-05-22 10:17:52 +08:00
xiongziliang
f54e02f511 修复http文件服务器相关bug 2021-05-22 09:28:19 +08:00
xiongziliang
8cbec43ee8 合并代码 2021-05-22 09:26:49 +08:00
xiongziliang
a391d1e289 修复rtsp推流带参相关的bug:#840 2021-05-22 09:25:24 +08:00
xiongziliang
08d4edddb0 修复http文件服务器相关bug 2021-05-22 09:13:00 +08:00
yapingcat
3c49b3737e fix bug rtcp sr包的 ssrc 和rtp包中的一致 2021-05-17 09:20:03 +08:00
xiongziliang
d395d23eeb 由于在RtspSession类确保了函数执行顺序,所以回滚多余代码也能确保单track流迅速注册 2021-05-15 10:05:47 +08:00