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

1523 Commits

Author SHA1 Message Date
ziyue 48d82daa5c 添加bom头 2021-06-28 16:02:13 +08:00
ziyue 8f730b8dab 整理代码 2021-06-28 10:36:50 +08:00
ziyue 430229fe94 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev_test 2021-06-28 10:11:39 +08:00
ziyue 02bd01c83b 完善http option命令 2021-06-28 10:10:09 +08:00
夏楚 fae86a9b4b !11 合帧逻辑 加强判断，防止 SPS PPS VPS 作为一帧，rtmp h264/h265 打包 保证帧内必须有VCL 
Merge pull request !11 from xiongguangjie/dev
 2021-06-28 02:02:49 +00:00
xiongziliang 3f36a10bee Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-26 18:28:31 +08:00
夏楚 4609716ba3
Merge pull request #933 from CharleyWangHZ/master 2021-06-26 03:55:17 +08:00
xiongguangjie 6d8d64caf6 for mergen 2021-06-25 21:24:53 +08:00
ziyue a7f75774e9 整理RtpReceiver相关代码 2021-06-25 16:24:44 +08:00
ziyue 964cf39145 RtcpContext修改时间戳单位、整理WebRTC相关代码 2021-06-25 14:59:27 +08:00
CharleyWangHZ 332e8fa180
Update HttpSession.cpp 2021-06-25 11:17:21 +08:00
CharleyWangHZ 248c9e8f9a
Update HttpSession.h 2021-06-25 10:59:56 +08:00
CharleyWangHZ e3d17848f6
Update HttpSession.cpp 2021-06-25 10:59:06 +08:00
ziyue 3862c8f1da 删除多余行 2021-06-24 17:53:37 +08:00
xgj e9d28c1386 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-24 11:53:15 +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
xiongguangjie 9b111fac62 add to do for h265 rtmp 2021-06-19 02:01:28 +08:00
xiongguangjie d215502ff5 rtmp packet must has vlc when flush 2021-06-19 01:54:57 +08:00
xiongguangjie a28aeb2148 for frame merge must has vlc(video codec layer) data and flush rtmp a frame must has vcl 2021-06-19 01:27:13 +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
xiongziliang 4cd618899b Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-15 10:02:58 +08:00
xiongziliang 125b703ea9 Merge remote-tracking branch 'origin/master' 2021-05-15 09:57:21 +08:00
xiongziliang e807a08f2e 单track rtsp推流加快媒体注册速度 2021-05-15 09:56:35 +08:00
xia-chu 5c90a1e137 完善nack与丢包重传 2021-05-11 11:18:55 +08:00
xiongziliang e8d3dec050 getBitArray方法返回nack第一个包状态 2021-05-11 00:34:17 +08:00
xiongziliang ec8e518180 完善fci相关代码 2021-05-10 23:27:11 +08:00
xia-chu 45abc23e87 放宽fci长度校验 2021-05-10 10:14:00 +08:00
xiongziliang 0377796c03 修复clang下编译警告和错误 2021-05-08 19:33:51 +08:00
xia-chu 842257edaa 完善rtcp ext 2021-05-06 12:02:16 +08:00
xia-chu cbee3210a0 完善twcc fci 2021-05-06 12:01:56 +08:00
xia-chu 6274cbdd28 统一代码风格 2021-04-30 14:31:08 +08:00
夏楚 1d0eca512b !6 优化rtsp推流单个Track其他协议的注册速度，不需要等待3s 
Merge pull request !6 from xiongguangjie/dev
 2021-04-30 14:29:36 +08:00
xia-chu 3cc640f96e 删除无效配置 2021-04-30 11:44:06 +08:00
xia-chu 88e1c323c3 删除无效配置 2021-04-30 09:24:09 +08:00
xgj 5145c7e658 optimize one track ready speed not wait 3000ms 2021-04-29 18:36:04 +08:00
xia-chu e021279fab 修复"Too short data for FU-A H.264 RTP packet"的问题 2021-04-28 16:07:01 +08:00
xia-chu 514a028eac 修复fu-a打包时，无rtp负载的情况 2021-04-28 16:03:05 +08:00
xia-chu ac55ae79fb 修复fci内存越界问题 2021-04-28 13:55:00 +08:00
xia-chu 1d84bb5458 完善twcc相关逻辑 2021-04-26 21:50:31 +08:00
xia-chu 6c951c8ca9 完善rtcp padding相关逻辑 2021-04-26 21:50:10 +08:00
xia-chu 2d8ef45e4d 完善fci相关代码 2021-04-26 21:03:04 +08:00
xia-chu aa54adb1ab 修复编译问题 2021-04-26 20:29:06 +08:00
xia-chu cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-26 19:50:17 +08:00
xia-chu af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu a28c76a33c 限制未就绪状态track的最大帧缓存数量 2021-04-26 14:58:06 +08:00
xia-chu fbc8c2286e 等待添加fci相关适配代码 2021-04-23 18:30:37 +08:00
xia-chu 8702ad101b 完善rtcp feedback相关代码 2021-04-23 18:27:47 +08:00
xia-chu 93160c0ec7 添加rtpfb枚举与工具类 2021-04-23 15:25:33 +08:00
xia-chu 48338af700 完善FCI相关代码 2021-04-23 15:06:55 +08:00
xia-chu 743862d786 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-23 09:43:08 +08:00
xiongziliang 259247132a Merge remote-tracking branch 'origin/master' 2021-04-22 22:13:17 +08:00
xiongziliang f70bfb5f8b 兼容GB28181 tcp推流缓存覆盖的垃圾设备 2021-04-22 22:02:21 +08:00
xia-chu 99a1d06d9b 修正TWCC错误理解 2021-04-22 18:56:12 +08:00
xia-chu 90ad90cb78 初步完成TWCC包的解析 2021-04-22 17:34:26 +08:00
xia-chu 5db6154707 添加TWCC部分代码 2021-04-22 11:43:33 +08:00
xia-chu dc3d59952e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-20 17:58:21 +08:00
xia-chu 0bb87858a3 提升单track情况下秒开体验 2021-04-20 17:53:43 +08:00
xia-chu 9b951ab69a 单track情况下最多等待3秒 2021-04-20 17:32:40 +08:00
xia-chu ef0371ef94 修复编译警告 2021-04-20 17:32:22 +08:00
xia-chu 007c04d958 编译警告修复 2021-04-20 17:17:56 +08:00
xia-chu cce9de74d3 完善rtcp nack相关代码 2021-04-20 17:15:01 +08:00
xiongziliang f69a23565d Merge remote-tracking branch 'github/master' into dev 2021-04-18 23:13:47 +08:00
xiongziliang 387574a802 rtp主动推流时不触发无人观看事件:#799 2021-04-18 21:34:34 +08:00
xiongziliang 980867965c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-18 21:04:10 +08:00
xiongziliang 7884338b60 修复rtmp协议amf3不兼容的bug 2021-04-18 21:02:01 +08:00
xia-chu 880b9139b0 性能优化 2021-04-15 19:46:45 +08:00
xia-chu d76c38ef72 调整264 rtp打包逻辑 2021-04-15 19:40:17 +08:00
xia-chu 9d385b36fd 优化多slice情况下关键帧判断逻辑 2021-04-15 19:40:17 +08:00
xia-chu e00fe51b26 关闭测试代码 2021-04-15 19:40:17 +08:00
xia-chu 46e3538dca Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-04-15 16:22:21 +08:00
xgj 3150ccdb70 add some comment 2021-04-15 14:08:25 +08:00
Your Name bffee09639 fix more slice nal one frame result rtp mark error and sps pps rtp not has a mark 2021-04-15 13:54:03 +08:00
xgj 6e4dfaf53f fix webrtc h264 rtp Packetizer error 2021-04-15 00:15:41 +08:00
xia-chu 765db1eb8b 添加rtcp fci相关代码 2021-04-14 18:39:21 +08:00
xia-chu a4ba0c2b60 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-14 09:26:11 +08:00
xia-chu c4fd9e294a Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-14 09:25:56 +08:00
xiongziliang 37096f8ed0 完善rtcp的定义 2021-04-13 22:27:57 +08:00
xia-chu 29c8c9bf26 Merge remote-tracking branch 'origin/dev' into dev 2021-04-13 18:51:16 +08:00
xia-chu f939e0a894 添加一些rtcp fci相关定义 2021-04-13 18:50:20 +08:00
夏楚 136d126e74 Update RtpReceiver.cpp 2021-04-13 08:28:23 +08:00
xia-chu 46b84fcf39 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-12 13:48:34 +08:00
xia-chu 8a51bd2d9e 新增rtp ssrc异常处理逻辑 2021-04-11 20:35:00 +08:00
xiongziliang 753fe05813 采用pts 2021-04-11 12:07:04 +08:00
xiongziliang 8b7289a689 rtsp推流支持关闭直接代理模式 2021-04-11 12:06:40 +08:00
xiongziliang 012f58d27c 添加rtp 调试接口 2021-04-11 01:15:02 +08:00
xiongziliang b2afae0e8a 暂时屏蔽一些日志 2021-04-07 21:02:28 +08:00
xia-chu 155c59e17e 添加rtc类型的推流 2021-04-07 18:17:49 +08:00
xia-chu f374f72312 添加rtcp bye相关代码 2021-04-07 16:58:05 +08:00
xiongziliang 2abb5078f9 实现rtc转rtsp 2021-04-03 09:34:49 +08:00
ziyue 33d2e71368 合并代码，去除冗余代码 2021-04-02 16:23:40 +08:00
xiongziliang a328520c9c buf fixed 2021-04-01 22:24:35 +08:00
xiongziliang 2434470fb8 G711强制规格 2021-04-01 22:20:29 +08:00
xiongziliang d2fec801c9 兼容不规范的rtmp推流器：#764 2021-04-01 22:03:21 +08:00
xiongziliang 075756c4c6 提升兼容性：#789 2021-04-01 21:46:02 +08:00
ziyue 2065b6fea8 去掉最大枚举定义 2021-03-30 11:51:19 +08:00
ziyue a7a94f0885 sdp相关的代码移动到主目录 2021-03-30 10:59:15 +08:00
xiongziliang 81f29fea61 基本完成sdp的解析和生成 2021-03-28 18:10:43 +08:00
xiongziliang 8aa3ff425b 完善sdp相关定义 2021-03-27 22:23:38 +08:00
ziyue 2f0bdf2724 修复32位编译时，websocket相关bug 2021-03-21 18:22:32 +08:00
xiongziliang f2edf354de rtmp支持更新config帧 2021-03-21 16:50:15 +08:00
ziyue c5b0485519 修复sps太长生成sdp异常的问题 2021-03-18 16:10:46 +08:00
ziyue 51ac93a08c rtp超时检测最多暂停5分钟 
更新zltoolkit
 2021-03-16 15:37:34 +08:00
ziyue 060b654252 修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟 2021-03-16 11:31:41 +08:00