amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,359 Commits 16 Branches 0 Tags 225 MiB
326b475beb
Commit Graph

142 Commits

Author SHA1 Message Date
a839419160
326b475beb
增加pcap解析工具(#4033 #4034)
Some checks failed
Android / build (push) Has been cancelled
Details
CodeQL / Analyze (cpp) (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
Docker / build (push) Has been cancelled
Details
Linux / build (push) Has been cancelled
Details
macOS / build (push) Has been cancelled
Details
Windows / build (push) Has been cancelled
Details
2024-11-22 17:43:15 +08:00
xia-chu
1753cbb81b Add compile options: -Wno-comment 2024-09-22 18:38:53 +08:00
gaoshan
116c3e4642
Fix android build, link log library (#3670) 2024-06-28 19:09:41 +08:00
KkemChen
2f6723f602
perf: 调整VideoStack相关代码 (#3642) 
1. 修复编译宏不生效问题
2. 新增reset接口，用于不断流的情况下变更拼接参数
 2024-06-19 14:06:02 +08:00
Lidaofu
968f6c69c3
修复Windows下链接OpenSSL静态库缺少Crypt32库的问题 (#3552) 
Co-authored-by: 李道甫 <lidf@ahtelit.com>
 2024-05-19 10:34:46 +08:00
xia-chu
e4de454d5d Charset default to UTF-8 on Windows 2024-04-20 22:25:21 +08:00
Aven
3dcd0ed463
Enable video stack individually (#3469) 2024-04-13 20:35:59 +08:00
xia-chu
af3ef996b0 Avoid build warnings in the main code 2024-03-30 14:59:28 +08:00
Jacob Su
208f57e2cd
Fix macOS compile error by rename version.h -> ZLMVersion.h (#3411 #3410) 2024-03-24 17:18:18 +08:00
KkemChen
437ae778c0
feat: VideoStack (#3373) 2024-03-16 22:56:32 +08:00
sandro-qiang
aeda47ec8c
修正SctpAssociation.cpp的访问越界 (#3182) 
ZLMediaKit/ZLMediaKit#3181
 2024-01-05 15:33:51 +08:00
snysmtx
8f4e76406c
修复编译 rpm 时获取调试信息失败问题 (#3151) 
Release 8.0 之后, 编译 rpm 会出现获取调试信息失败问题,  导致 rpm 打包失败

虽然说可以禁用调试包生成来规避问题, 但个人认为在编译 DEBUG 版本时生成调试信息包还是有必要的
 2023-12-22 17:40:42 +08:00
xia-chu
25c99470ee feat: add support of codec plugin 2023-12-10 11:09:04 +08:00
夏楚
bbe8f4a018
release 8.0 2023-12-09 16:23:51 +08:00
alexliyu7352
4648c156c8
优化hls播放器,使用持久化连接 (#3070) 
hls播放时，如果对方reset断开了tcp连接，应该自动发起重连
 2023-12-01 17:56:08 +08:00
alexliyu7352
db3f0147be
升级jemalloc到5.3版本 (#2884) 
升级jemalloc到5.3版本,相比5.2.1内存稳定许多,去除--without-export编译参数,
解决类似glibc中分配内存却在jemalloc中释放导致崩溃问题.
比如: toolkit::LoggerWrapper::printLogV中使用的vasprintf
 2023-10-09 19:37:04 +08:00
Xiaofeng Wang
75e41bf3b8
仅在有 parent 时设置到 parent 中 (#2676) 2023-07-19 22:38:28 +08:00
Xiaofeng Wang
7b1a4d23e1
Reset cached value at start (#2664) 2023-07-15 18:47:05 +08:00
XiaoYan Lin
cb0579a16d
新增支持hls-fmp4直播(#2603 #977 #1965) 
同时主要优化点包括：
1、编译宏特性开关优化。
2、转协议复用器相关创建代码移动至Recorder类。
3、转协议复用器onAllTrackReady函数修改为addTrackCompleted。
4、startRecord/stopRecord/isRecording接口新增支持ts/fmp4/hls-fmp4协议。

Co-authored-by: xia-chu <771730766@qq.com>
Co-authored-by: linxiaoyan87 <linxiaoyan87@foxmail.com>
 2023-07-02 12:02:33 +08:00
朱如洪
c530f281c3
优化CMakeList, 完善iOS下编译配置 (#2578) 
1、调整 json 的源码引入，外部可以引入 json/json.h 使用；
2、针对 iOS 工程调整 cmake 配置，解决 iOS 环境下mk_util.h 找不到问题；同时在 iOS 工程中引入 MediaServer 静态库；
 2023-06-27 10:51:31 +08:00
tbago
c0a7a4ab70
优化cmake配置文件, 添加必要头文件 (#2558) 
- enable_server cmake选项生效;
- enable_tests 选项在api目录下的test同样生效;
- 增加stdio.h 防止编译失败;
 2023-06-17 10:24:17 +08:00
xia-chu
843e3423cf 新增实例上报功能: #2294 2023-03-12 00:14:22 +08:00
Alexandr
8bcc2cddc8 Build without usrsctp 2022-12-30 08:51:37 +03:00
xiongziliang
228fa17327 windows平台默认开启wepoll(iocp) 2022-11-13 00:38:56 +08:00
xiongziliang
44fd6b86bc 完善版本信息 2022-11-06 00:38:14 +08:00
monktan89
7e95bd2078 修复MSVC编译问题 2022-11-03 10:51:49 +08:00
Dw9
9b8f2c5f3d 修复assert路径错误 2022-09-25 12:12:23 +08:00
Xiaofeng Wang
0c882d4d79 cmake: fix include directory for assert.h 2022-09-19 21:16:56 +08:00
Xiaofeng Wang
11dfcf3bdb cmake: -Wl linking flags 2022-09-19 21:02:51 +08:00
Xiaofeng Wang
c282775205 cmake: fix linking asan 2022-09-19 21:00:48 +08:00
紫耀风
4e8c56e2be
使用wepoll iocp模拟epoll api,实现在windows下支持iocp (#1871) 2022-08-11 10:18:16 +08:00
ziyue
13dd8c699b 整理cmake 2022-08-01 16:12:52 +08:00
Xiaofeng Wang
25e9cd07db 避免其他模块查找过程污染基础环境 
Close https://github.com/ZLMediaKit/ZLMediaKit/issues/1840
 2022-07-30 11:26:48 +08:00
Xiaofeng Wang
be3cc33800 Fix build on apple M1 2022-07-29 19:37:51 +08:00
Xiaofeng Wang
8cb73e1bc3 修正 Windows 编译问题 2022-07-28 00:25:50 +08:00
Xiaofeng Wang
310b60276c cmake: try to disable compile warning of C4819 2022-07-26 13:25:36 +08:00
Xiaofeng Wang
a35134a5ca cmake: fix version.h path 2022-07-26 13:09:25 +08:00
Xiaofeng Wang
0b33769ee9 cmake: 库列表名称变更 2022-07-25 23:44:02 +08:00
Xiaofeng Wang
9d3ead61de 整理 CMakeLists.txt 2022-07-25 00:22:30 +08:00
alexliyu7352
07982b7243
静态连接到jemalloc库: #1759 2022-06-29 10:59:44 +08:00
xiongziliang
0eacda5327 新增docker ci并全面整理ci 2022-06-19 18:14:43 +08:00
xiongziliang
a44b770d9d 完善Android工程 2022-06-19 01:12:14 +08:00
xiongziliang
b24c4f8d33 默认禁用编译ffmpeg相关特性 2022-06-18 20:50:25 +08:00
Xiaofeng Wang
705875f410 添加 dl 依赖库 2022-06-12 18:27:55 +08:00
xiongguangjie
aa2ff01d9f first commit for srt intergrate 2022-06-03 13:25:32 +08:00
夏楚
e2908e9775
cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660) 
* 解决msvc下链接问题
* CMAKE添加自动生成mk api export头文件
* 兼容非cmake构建时情况

Co-authored-by: baiyfcu <baiyfcu@gmail.com>
 2022-05-26 20:30:43 +08:00
ziyue
0739b1ddd2 完成FFmpeg相关代码迁移改造 2022-05-25 15:51:08 +08:00
zhaoyi233
d78657b706
检查sendmmsg相关依赖并设置对应的宏 2022-05-21 15:18:51 +08:00
starry
943deab664
解决CentOS7下Parse.cpp编译不通过问题 (#1627) 
* Update CMakeLists.txt
解决编译不通过问题
 2022-05-12 15:12:13 +08:00
Xiaofeng Wang
5844b61880
Merge pull request #1607 from Dw9/master 
Update CMakeLists.txt
 2022-05-05 09:38:44 +08:00