amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 03:30:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,580 Commits 16 Branches 0 Tags 225 MiB
a06b4321be
Commit Graph

3580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
756b6a4cff Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-07-06 23:12:52 +08:00
夏楚
ea39ffe558
Merge pull request #966 from johzzy/master 
整合rtp ext相关定义.
 2021-07-06 23:13:05 +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
Johnny
849a2a0de8 整合rtp ext相关定义. 2021-07-06 17:54:10 +08:00
ziyue
bf8642d62f 修复笔误：#955 2021-07-06 11:16:59 +08:00
ziyue
0838db5326 修复tcp server循环引用的问题 2021-07-06 10:34:00 +08:00
xiongziliang
4ef1fe2a1f 修复tcp服务器负载均衡机制失效的问题 2021-07-05 22:33:21 +08:00
ziyue
477dd17b5f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit 2021-07-05 21:15:24 +08:00
ziyue
4a6c164d83 更新网络框架,解决负载不够均衡的问题 2021-07-05 21:14:08 +08:00
wxf
1e4963b8fc 修正 Nack 回环检查 2021-07-02 15:56:35 +08:00
ziyue
b9fad1e5f3 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit 2021-07-02 14:56:21 +08:00
ziyue
77ba24b59c 修改错误代码 2021-07-02 14:55:22 +08:00
ziyue
c97678af0a webrtc播放触发流未找到事件，实现按需生成流 2021-07-02 14:50:48 +08:00
wxf
c426c702df Fix error: cannot bind packed field to T& 2021-07-01 22:06:03 +08:00
ziyue
81c5f5030a 新增作者 2021-07-01 11:03:28 +08:00
ziyue
1dd88fceaa Merge branch 'master' of https://github.com/lawrencehj/ZLMediaKit 2021-07-01 11:02:17 +08:00
ziyue
1485be266a 查找MediaSource时，app与stream id不能为空 2021-07-01 10:56:59 +08:00
lawrencehj
f1d89b5297 修正Windows下宏替换编译错误问题 2021-07-01 10:39:28 +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
4ec311652a 未找到依赖库时，关闭编译test_player 2021-06-29 18:37:09 +08:00
ziyue
ebb7aeef9b 播放器沿用之前名称 2021-06-29 18:26:03 +08:00
ziyue
d8f75aee55 新增作者 2021-06-29 18:20:18 +08:00
ziyue
11e993d870 修改接口 2021-06-29 18:19:05 +08:00
ziyue
013109796d 确保线程安全 2021-06-29 17:53:26 +08:00
ziyue
1b674a6ac2 播放器新增支持音频:#945 2021-06-29 17:47:01 +08:00
ziyue
66f28f52b4 添加Ptr定义 2021-06-29 17:42:32 +08:00
ziyue
df377fc1f4 修改宏定义，防止频繁重新全量编译 2021-06-29 17:41:56 +08:00
ziyue
509930ff0a Merge branch 'master' of https://github.com/DoubleX69/ZLMediaKit 2021-06-29 11:50:24 +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
DoubleX69
d4b3036446 add：增加Audio子目录及对应的库 2021-06-28 17:51:58 +08:00
DoubleX69
0263bb9b50 修改提示信息 2021-06-28 17:51:08 +08:00
DoubleX69
4edb015d2d add: 增加AudioPlayer播放音频 2021-06-28 17:34:07 +08:00
DoubleX69
5ac4e3cc72 add: 增加Audio相关代码 2021-06-28 17:33:26 +08:00
ziyue
7e5873d818 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit 2021-06-28 16:29:50 +08:00
ziyue
ded38fc3f6 Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit 2021-06-28 16:03:20 +08:00
ziyue
48d82daa5c 添加bom头 2021-06-28 16:02:13 +08:00
Xiaofeng Wang
42d2c1b4c0
Merge pull request #941 from ZLMediaKit/feature/fix-cmake-prepend 
Revert "调整链接顺序, 修正编译问题"
 2021-06-28 14:03:44 +08:00
Xiaofeng Wang
e1be491d4c
Merge pull request #940 from ZLMediaKit/feature/fix-cmake-prepend 
Revert "调整链接顺序, 修正编译问题"
 2021-06-28 14:03:33 +08:00
xgj
f06faa7c02 cmake list PREPEND only from 3.15 support use append linux use link group solve link order error 2021-06-28 13:56:12 +08:00
wxf
8cf58dd843 Revert "调整链接顺序, 修正编译问题" 
This reverts commit a92b02907d.
 2021-06-28 13:53:28 +08:00
ziyue
cd7af6fa4e update 2021-06-28 11:31:11 +08:00
ziyue
89fb4222ce 默认关闭编译webrtc 2021-06-28 10:46:03 +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