Commit Graph

2901 Commits

Author SHA1 Message Date
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
e044d5cef9 修复配置文件http虚拟目录名 2021-08-26 19:56:19 +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
4a063bee43 更新推荐项目与作者列表 2021-08-24 12:00:23 +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
8b1d1d6e24 修复可能访问空指针的问题 2021-08-23 11:00:20 +08:00
ziyue
b3ad0891e6 修复除0的bug 2021-08-22 15:13:20 +08:00
xiongziliang
10afab77f3 Merge branch 'feature/keep_alive_monk' of https://gitee.com/xia-chu/ZLMediaKit 2021-08-21 19:11:20 +08:00
xiongziliang
41c09757a7 解决GB28181推流无ntp时间戳导致的问题 2021-08-21 18:52:52 +08:00
夏楚
ce41fa268e
Merge pull request #1053 from johzzy/master
fix stun packet memory leak.
2021-08-20 16:03:41 +08:00
monktan
a60ce1b1c9 添加serverkeepalive hook接口 2021-08-20 14:52:48 +08:00
ziyue
94a6dc66c9 修复生成rtmp包时间戳错误的问题 2021-08-19 19:52:55 +08:00
Johnny
6f3f69b459 fix stun packet memory leak. 2021-08-19 19:14:58 +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
1b4f5313f2 修复异步http api相关bug 2021-08-18 20:37:10 +08:00
ziyue
10522e4ea5 完善getOriginUrl接口 2021-08-16 17:31:13 +08:00
ziyue
232263669c 修复回放速度回调事件user_data指针错误的问题 2021-08-16 16:42:09 +08:00
夏楚
7885777429
Merge pull request #1041 from ZLMediaKit/feature/workflow-windows
添加 MSVC CI
2021-08-16 14:53:56 +08:00
wxf
a93bba95c1 更新 Toolkit 统一使用 cmake 查到的 ssl 2021-08-16 11:25:14 +08:00
Xiaofeng Wang
870e71d2ce
Merge pull request #1040 from holychaos/master
修改Nakc.cpp在Windows下编译报错的Bug

Fix #1039
2021-08-14 17:48:10 +08:00
wxf
c18c870a1b 添加 MSVC CI 2021-08-14 16:11:32 +08:00
Xinghua Zhao
da25ce9b83 修改Nakc.cpp在Windows下编译报错的Bug 2021-08-14 10:42:32 +08:00
夏楚
6a32354d8a
Merge pull request #1035 from ZLMediaKit/feature/coding-style 2021-08-13 23:45:04 +08:00
baiyfcu
b8aabb5eab
Merge branch 'master' into master 2021-08-13 16:14:49 +08:00
ziyue
1d161bcdc2 修复webrtc srtp相关功能在大端64位系统崩溃的问题 2021-08-13 16:07:27 +08:00
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