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

2707 Commits

Author SHA1 Message Date
wxf 6269ce1f19 添加默认代码风格配置 .clang-format 2021-08-13 13:41:57 +08:00
ziyue 8fd9853bc9 完善http断开时日志 2021-08-13 10:59:13 +08:00
ziyue ec9b8c6471 降低http链接断开日志级别 2021-08-13 10:57:04 +08:00
ziyue 0f6d1135eb 优化http调试日志性能 2021-08-12 21:29:02 +08:00
ziyue 7b60f8b093 优化完善代码 2021-08-12 20:55:11 +08:00
ziyue 4dbe0a1d3e 合并pr：#1025 2021-08-12 20:37:46 +08:00
ziyue 30b139eaf0 Merge branch 'feature_bafc' of https://github.com/xia-chu/ZLMediaKit 2021-08-12 11:18:34 +08:00
ziyue e3d519dde6 无人观看自动关闭流时才打印日志 2021-08-12 10:54:57 +08:00
ziyue 094f7553c9 合并pr(rtp最大大小可配置)：#1028 2021-08-12 10:44:12 +08:00
monktan 7ed7e5386c rtp包最大大小可配置 2021-08-11 15:48:15 +08:00
baiyfcu 0ed902509a player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件 2021-08-09 18:28:43 +08:00
ziyue 9e5d325e43 Merge remote-tracking branch 'origin/master' 2021-08-05 14:52:05 +08:00
ziyue 018fa40946 打印codec信息时,打印url信息 2021-08-05 14:49:52 +08:00
夏楚 d786aed2f3
Merge pull request #1019 from ZLMediaKit/feature/fix-#1018 
调整结构, 清理关系, 取消继承 MP4FileDisk, 改为成员
 2021-08-04 17:05:08 +08:00
wxf e03d15053d 调整结构, 清理关系, 取消继承 MP4FileDisk, 改为成员 
Fix #1018
 2021-08-03 21:48:19 +08:00
ziyue f833bfb031 修复编译问题 2021-08-02 17:12:59 +08:00
ziyue f5842f8c1f 新增读取h264文件转流媒体范例 2021-08-02 15:54:51 +08:00
ziyue 91f370e925 新增remainData接口 2021-08-02 15:53:26 +08:00
ziyue 6df0ee69e0 修复rtsp aac config兼容性bug: #1011 2021-07-30 16:52:13 +08:00
ziyue 375d36b4c8 确保rtp丢包时，丢弃gop后续所有帧，防止丢包花屏 2021-07-29 16:22:43 +08:00
ziyue 55fc598d4c 修复nack fci相关bug 2021-07-28 12:20:16 +08:00
ziyue 5c52c636a3 完善nack/srtp相关代码 2021-07-28 11:18:09 +08:00
ziyue 80ab84cbb5 防止nack异步触发时对象析构导致的崩溃 2021-07-27 20:58:01 +08:00
ziyue b1dc285649 优化代码 2021-07-27 20:52:51 +08:00
ziyue c59a7a04c3 nack/rtx支持多次重传，提高抗丢包率 2021-07-27 20:42:25 +08:00
ziyue 3840ff2a3f 修复rtt计算逻辑 2021-07-27 10:50:34 +08:00
ziyue 10eb063f63 rtp时间戳采用pts 2021-07-27 10:16:35 +08:00
ziyue 42ef41cb58 修复rtp时间戳映射机制相关bug: #998 2021-07-22 20:31:02 +08:00
ziyue 58d5026191 websocket客户端添加获取http连接的接口，方便设置http请求头 2021-07-22 15:48:10 +08:00
ziyue 0e27704859 修复编译问题 2021-07-22 14:59:23 +08:00
ziyue 30840d8200 修复nack/rtx发送时相关bug 2021-07-21 16:44:40 +08:00
ziyue da9d3a3b1f 更新ZLToolKit 2021-07-20 21:29:46 +08:00
ziyue a07addfe38 更新zltoolkit 2021-07-20 21:00:25 +08:00
ziyue 2dcc2c34b2 更新ZLToolKit,提升性能 2021-07-20 20:53:19 +08:00
ziyue 566a49e227 修复getMediaTracks接口相关功能 2021-07-20 13:15:57 +08:00
ziyue 46722546a6 Merge remote-tracking branch 'origin/master' 2021-07-20 12:43:28 +08:00
ziyue 4b34e58d3c 移除MultiMuxerPrivate对象，修复rtp发送时无sps pps帧的问题 2021-07-20 12:42:53 +08:00
ziyue 902c25ae67 删除无效代码 2021-07-20 12:42:53 +08:00
夏楚 09d5fdaf41
Merge pull request #994 from lawrencehj/master 
解决Windows下编译出错问题
 2021-07-19 10:39:45 +08:00
lawrencehj b6ce03b64f 解决Windows下编译出错问题 2021-07-19 10:31:24 +08:00
夏楚 f47e1ecd31
Merge pull request #993 from ZLMediaKit/feature/update-splitter-usage 
Http/HttpRequestSplitter: 添加使用注意事项
 2021-07-18 20:11:59 +08:00
xiongziliang 49f59fb993 Merge branch 'feature/ps-decoder-cache-buffer' of https://github.com/xia-chu/ZLMediaKit 2021-07-18 19:43:12 +08:00
夏楚 6dbad3fb59
Merge pull request #992 from ZLMediaKit/feature/ignore-hik-ps-0xbd 
忽略海康 PS 流中的 0xBD 包
 2021-07-18 19:40:38 +08:00
夏楚 a9de3723df
Merge pull request #990 from ZLMediaKit/feature/packet-sorter-fix-seq 
调整 packet sorter
 2021-07-18 19:39:38 +08:00
wxf f0c5633bfb Http/HttpRequestSplitter: 添加使用注意事项 2021-07-18 17:36:46 +08:00
wxf 2f82c89278 忽略海康 PS 流中的 0xBD 包 2021-07-18 17:31:27 +08:00
wxf 9dd602c242 GB28181Process: 不再需要缓存未处理完的 PS/TS 帧 
* PS 帧已由 PSDecoder 缓存;
* TS 帧在 TSDecoder 中有判断是否为 TS, 即使出错缓存也无意义;
 2021-07-18 15:08:49 +08:00
wxf 5172b846d3 PSDecoder: 缓存未处理完的数据 2021-07-18 15:08:44 +08:00
wxf b891fc5654 _rtp_sort_cache_map -> _pkt_sort_cache_map, 不依赖于 RTP 2021-07-17 20:00:09 +08:00
wxf ac01dc97af 修正对非 uint16_t 序号的支持 2021-07-17 20:00:02 +08:00