amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-27 13:49:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,275 Commits 16 Branches 0 Tags 225 MiB
84dbe4b076
Commit Graph

4275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gongluck
0764e48f6c
兼容安卓平台，to_string模板处理pt值 2022-08-18 19:13:22 +08:00
Dw9
30984d2076
mp4录制支持作为观看者参与播放人数统计 (#1880) 2022-08-16 11:47:24 +08:00
ziyue
c19fa29e75 更新zltoolkit，修复绑定ipv6地址可能失败的问题 2022-08-15 11:59:09 +08:00
xiongguangjie
a1000da71f add get version restful api 2022-08-12 18:09:44 +08:00
ziyue
6382fcb3be 确保on_publish事件回调时线程安全 2022-08-11 18:36:17 +08:00
紫耀风
4e8c56e2be
使用wepoll iocp模拟epoll api,实现在windows下支持iocp (#1871) 2022-08-11 10:18:16 +08:00
ziyue
b34db64961 修复非法aac rtp包导致的除0崩溃问题: #1869 2022-08-10 10:44:34 +08:00
ziyue
795b4dbbd3 修复http文件服务器对特殊字符文件不兼容的bug:#1866 2022-08-10 10:37:49 +08:00
ziyue
099845b329 FMP4Packet时间戳类型改成64位 2022-08-08 17:57:29 +08:00
ziyue
35791aac89 优化代码，去除编译警告，修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue
9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
ziyue
143580d780 修复编译警告 2022-08-08 15:28:43 +08:00
ziyue
b42a9e8e84 新增作者 2022-08-05 18:11:46 +08:00
ziyue
663d167837 格式化代码 2022-08-05 17:55:48 +08:00
ziyue
ba947cb6b5 调整switch case语句缩进 2022-08-05 17:42:17 +08:00
ziyue
f85de2e108 精简复用rtp encoder创建相关代码 2022-08-05 17:36:51 +08:00
ziyue
d3ac296228 调整switch case代码风格 2022-08-05 17:23:46 +08:00
ziyue
fe3f9e3cff 更新zltoolkit 2022-08-05 16:01:43 +08:00
ziyue
7458a67c66 修正deleteRecordDirectory接口拼写错误并精简代码 2022-08-05 16:01:31 +08:00
Dw9
024c3e1a28
Merge pull request #1856 from Dw9/master 
修复pr1851 删除文件判断逻辑错误
 2022-08-04 22:29:34 +08:00
Dw9
73d2cd4ff7 修复pr1885 删除文件判断逻辑错误 2022-08-04 22:00:44 +08:00
dreamisdream
db70aec690
增加webapi deleteRecordDirectroy(删除录像文件夹) (#1851) 2022-08-04 10:15:07 +08:00
Xiaofeng Wang
1491770dba 生成的文件放到当前模块的目录下 2022-08-03 22:31:52 +08:00
明月惊鹊
5e317b1914
API目录支持安卓编译，输出libmk_api.a (#1854) 
* API目录支持安卓编译，输出libmk_api.a

* API目录支持安卓编译，输出libmk_api.a[参考 wasphin大佬的指导改进了一些地方]

* update ndk version

Co-authored-by: 夏楚 <771730766@qq.com>
 2022-08-03 20:57:16 +08:00
ziyue
ec3fe4350a 修复开启时间戳覆盖后崩溃的bug: #1848 2022-08-02 11:06:33 +08:00
Xiaofeng Wang
70c7a7aa57 依赖 ZLMediaKit 的模块需要继承宏定义以及依赖 2022-08-01 17:48:11 +08:00
ziyue
32a6126a4b 修正docker编译问题 2022-08-01 17:33:58 +08:00
ziyue
2bd52fa93d 隐藏c sdk中webrtc相关代码 2022-08-01 17:27:34 +08:00
ziyue
3aa21389cc 删除Android openssl库 2022-08-01 17:22:53 +08:00
ziyue
13dd8c699b 整理cmake 2022-08-01 16:12:52 +08:00
Xiaofeng Wang
98f158bf31 修正 OpenSSL 未开启问题 2022-08-01 12:28:16 +08:00
ziyue
316301e910 确保rtsp直接拉流代理支持GOP缓存: #1843 2022-08-01 11:35:38 +08:00
Xiaofeng Wang
25e9cd07db 避免其他模块查找过程污染基础环境 
Close https://github.com/ZLMediaKit/ZLMediaKit/issues/1840
 2022-07-30 11:26:48 +08:00
Xiaofeng Wang
d9d33b8522
Merge pull request #1842 from wasphin/feature/apple-m1 
Fix build on apple M1
 2022-07-29 19:59:07 +08:00
Xiaofeng Wang
be3cc33800 Fix build on apple M1 2022-07-29 19:37:51 +08:00
ziyue
bdd83cf61a cpp测试程序添加必要编译宏 2022-07-29 18:14:10 +08:00
ziyue
afcf247464 完善mpegts/ps容器对aac音频的兼容: #1801 2022-07-29 18:05:16 +08:00
ziyue
ace989d378 完善rtp server日志打印 2022-07-29 17:57:52 +08:00
ziyue
24db0454a8 不支持的协议直接抛异常, 防止非法推拉流：#1725 2022-07-29 17:32:30 +08:00
ziyue
54f400a6e9 确保MediaServer主函数可以多次调用: #1838 2022-07-29 16:24:43 +08:00
ziyue
3cb0f66093 修复Android ci编译问题 2022-07-29 16:07:04 +08:00
ziyue
5babe63cdb 修复Windows编译问题 2022-07-29 15:47:06 +08:00
ziyue
7d8b212a3c 修复rtmp汇报窗口太小导致循环递归的bug：#1839 2022-07-29 12:02:00 +08:00
Xiaofeng Wang
9ea98642c1
Merge pull request #1837 from wasphin/feature/cmake-fix-sctp 
修正启用 SCTP 后编译问题
 2022-07-29 08:05:14 +08:00
Xiaofeng Wang
b1ccbcc4ae Linux CI 中开启 SCTP 2022-07-28 23:18:23 +08:00
Xiaofeng Wang
c14a777598 修正启用 SCTP 后编译问题 2022-07-28 23:15:22 +08:00
夏楚
d0f0c69f93
Merge pull request #1836 from CharleyWangHZ/master 
Update MediaSource.h
 2022-07-28 19:57:16 +08:00
CharleyWangHZ
2685f3cdc2
Update MediaSource.h 2022-07-28 16:43:03 +08:00
夏楚
76df34de81
Merge pull request #1825 from wasphin/feature/cmake 
整理 CMakeLists.txt
 2022-07-28 14:27:44 +08:00
夏楚
6fd207118a
Merge pull request #1829 from dcan123/master 
新增rtp udp收流增加丢包率
 2022-07-28 14:17:18 +08:00