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

1569 Commits

Author SHA1 Message Date
ziyue 5f2e4ff2c0 修复http文件目录相关bug:#1083 2021-09-03 17:58:23 +08:00
ziyue 415bc95dda 完善ntp时间戳计算逻辑 2021-09-02 21:39:10 +08:00
ziyue 186c15364a 精简Frame对象实例化相关代码 2021-09-02 10:56:21 +08:00
ziyue 57e91054af 合并日志相关pr: #1077 2021-08-30 20:47:11 +08:00
kevin cheng 7d456a0513 Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit 2021-08-30 19:04:50 +08:00
kevin cheng 5bd169e6de 新增C API 广播日志到上层应用 2021-08-30 19:03:20 +08:00
ziyue b9a699588e Merge remote-tracking branch 'origin/master' 2021-08-30 18:05:46 +08:00
ziyue 04bf829540 非rtsp协议减少一帧延时 2021-08-30 18:05:21 +08:00
xiongziliang d2f02c0a0c 修复rtsp sdp解析的bug 2021-08-28 13:02:53 +08:00
ziyue 2242577661 优化解析复杂数据结构配置项时的性能 2021-08-27 11:11:05 +08:00
ziyue 848774271f 合并并完善http虚拟目录相关代码 2021-08-26 19:50:19 +08:00
ziyue 03e9c09c42 修复FullUrl()未url转义导致的bug 2021-08-26 19:10:04 +08:00
baiyfcu 626bf3dcf9 添加http文件服务可挂载物理目录，新增ENABLE_API_STATIC_LIB 
sa
 2021-08-25 14:30:31 +08:00
ziyue bb63273c73 计算dts逻辑兼容一些奇怪的rtsp流:#1031 2021-08-23 21:48:30 +08:00
ziyue 07c5341fb0 兼容一些奇怪的rtsp流:#1031 2021-08-23 21:29:23 +08:00
ziyue b3ad0891e6 修复除0的bug 2021-08-22 15:13:20 +08:00
xiongziliang 41c09757a7 解决GB28181推流无ntp时间戳导致的问题 2021-08-21 18:52:52 +08:00
ziyue 94a6dc66c9 修复生成rtmp包时间戳错误的问题 2021-08-19 19:52:55 +08:00
ziyue 1cddc2227b 修复h265关键帧判断逻辑bug 2021-08-18 22:26:24 +08:00
ziyue 821b0e4bb6 兼容最后一帧时间戳等于sps pps时间戳的的异常流 2021-08-18 22:19:36 +08:00
ziyue 10522e4ea5 完善getOriginUrl接口 2021-08-16 17:31:13 +08:00
baiyfcu b8aabb5eab
Merge branch 'master' into master 2021-08-13 16:14:49 +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
wxf e03d15053d 调整结构, 清理关系, 取消继承 MP4FileDisk, 改为成员 
Fix #1018
 2021-08-03 21:48:19 +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 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 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
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
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
ziyue 892b2d2ef9 修复对象同名导致的bug 2021-07-16 15:58:01 +08:00
ziyue 8548753c28 修正SDES rtcp对象命名 2021-07-15 17:38:04 +08:00
ziyue c25da5a222 修复H265 vlc帧判断逻辑bug 2021-07-15 17:36:44 +08:00
ziyue 8d5f29d94c Merge branch 'feature/find-async-by-session' of https://github.com/xia-chu/ZLMediaKit 2021-07-15 11:50:10 +08:00
ziyue c8f00cefa0 完善获取flv是否包含音视频相关逻辑 2021-07-15 11:29:21 +08:00
wxf ece7186e6c 改为按 Session 查找媒体源以支持 TCP/UDP Session 2021-07-15 11:25:48 +08:00
ziyue fe42ea30fc 整理flv复用器 2021-07-15 11:16:11 +08:00
ziyue b12bd6e7ff 格式化代码 2021-07-14 21:41:26 +08:00
ziyue 09d7670fdf 收到sender report包前，通过系统时间戳产生ntp时间戳 2021-07-14 21:41:13 +08:00
ziyue 6ddd420f1c 修复webrtc rtx包计入receiver report统计导致simulcast推流失效的问题 2021-07-14 21:40:08 +08:00
ziyue 6bc39058ab 加大时间戳跳变容忍度，防止网络抖动时导致音视频不同步 2021-07-13 17:30:54 +08:00
ziyue 77283f3973 优化ntp时间戳获取性能 2021-07-13 10:10:23 +08:00
ziyue 1cf79e886b 新增rtp时间戳大幅跳跃处理逻辑 2021-07-12 21:47:56 +08:00
ziyue 298f6e3864 rtp使用ntp时间戳作为时间戳,用于实现rtsp音视频同步 2021-07-12 21:18:22 +08:00
yangkun 03f6f4c4c0 fix publish type 2021-07-09 14:58:58 +08:00
ziyue 9217a5dbcd 精简代码 2021-07-09 14:04:34 +08:00
ziyue 4b0d0efdfb 修复笔误 2021-07-09 14:02:25 +08:00
ziyue 35d9321b93 整理H264/H265 Frame对象及相关代码 2021-07-09 13:38:20 +08:00
ziyue 4fb4471647 修复265 rtmp/flv相关bug:#965 2021-07-08 17:09:42 +08:00
ziyue 4b694ccde8 http-ts直播减少一次内存拷贝 2021-07-07 16:17:56 +08:00
ziyue 039be5444e 修复m3u8中extinf不准的问题：#816 2021-07-07 11:53:01 +08:00
ziyue 03addaf0b7 由于frame merge时已经过滤无效帧，所以移除多余代码 2021-07-07 11:37:22 +08:00
ziyue 59131e3b0a 修复ts/ps解析后组帧逻辑bug：#964 2021-07-07 11:02:36 +08:00
xiongziliang 9f9b3a5a64 提高http-ts直播性能：#961 2021-07-06 23:57:39 +08:00
xiongziliang c393cc7c0e 修复GB28181粘帧导致花屏的问题: #964,#954 2021-07-06 23:37:04 +08:00
xiongziliang 986e9511a2 完善rtt相关代码 2021-07-06 23:09:56 +08:00
ziyue 4c296488f1 修复rtcp rr/sr时间戳转换相关问题,计算rtt 2021-07-06 21:48:51 +08:00
ziyue 1485be266a 查找MediaSource时，app与stream id不能为空 2021-07-01 10:56:59 +08:00
xiongziliang 09fa6b7aae 精简代码 2021-06-30 23:35:19 +08:00
xiongziliang c470016316 优化MediaSource遍历性能 2021-06-30 23:03:27 +08:00
ziyue 69c3b24d06 优化遍历MediaSource接口性能 2021-06-30 21:24:16 +08:00
ziyue 66f28f52b4 添加Ptr定义 2021-06-29 17:42:32 +08:00
ziyue df377fc1f4 修改宏定义，防止频繁重新全量编译 2021-06-29 17:41:56 +08:00
ziyue 3165a2f81c 修改服务器版本信息声明相关代码 2021-06-29 11:16:05 +08:00
ziyue dfbfd65ab3 宏定义移至macros.h文件 2021-06-28 20:29:56 +08:00
ziyue de5cf86050 http最大请求加大到40 KB 2021-06-28 20:12:35 +08:00
ziyue 397c1c7c57 整理宏 2021-06-28 20:12:07 +08:00
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