amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 20:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,153 Commits 16 Branches 0 Tags 224 MiB
81199fabd4
Commit Graph

220 Commits

Author SHA1 Message Date
夏楚
c72cf4cbcc
整理命名空间 (#1409) 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
 2022-02-02 20:34:50 +08:00
ziyue
88dc8d0a73 重写http客户端异常处理机制 2022-01-20 15:17:19 +08:00
ziyue
5b6ff0af27 完善mingw编译环境的适配 2022-01-11 14:09:57 +08:00
ziyue
7f6be9e118 Refine: 消除编译警告 2021-12-30 15:28:27 +08:00
648540858
7aaa10eb3c
修复推流测试工具查询流时的调用错误 (#1273) 
* 修复推流测试工具查询流时的调用错误

* 确保选择正确类型的MediaSource

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-14 11:02:30 +08:00
ziyue
5b916101d9 Refine: 提高拉流压测工具性能与正确性 2021-11-24 15:38:20 +08:00
ziyue
750a8fa668 修复关闭webrtc后的编译问题 2021-10-18 20:23:50 +08:00
xiongziliang
0ae1d46892 基本完成twcc rtcp fci的生成 2021-10-07 12:28:59 +08:00
ziyue
15edbeac3e 整理http相关代码 2021-09-30 16:10:09 +08:00
monktan
004c62bea4 添加k8s部署相关说明 2021-09-13 21:16:22 +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
ziyue
8548753c28 修正SDES rtcp对象命名 2021-07-15 17:38:04 +08:00
wxf
e679404701 tests: 调整测试程序名称获取方式 2021-07-15 11:15:34 +08:00
ziyue
1b674a6ac2 播放器新增支持音频:#945 2021-06-29 17:47:01 +08:00
ziyue
509930ff0a Merge branch 'master' of https://github.com/DoubleX69/ZLMediaKit 2021-06-29 11:50:24 +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
48d82daa5c 添加bom头 2021-06-28 16:02:13 +08:00
夏楚
fae86a9b4b !11 合帧逻辑 加强判断，防止 SPS PPS VPS 作为一帧，rtmp h264/h265 打包 保证帧内必须有VCL 
Merge pull request !11 from xiongguangjie/dev
 2021-06-28 02:02:49 +00:00
wxf
b026634a3e 未启用 WebRTC 的情况下禁用相关测试用例 2021-06-26 17:10:42 +08:00
xiongguangjie
c0f362af33 for linux compile --start-group and --end-group 2021-06-25 22:03:52 +08:00
ziyue
a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
ziyue
24ab876fdb 修复重连时，创建多个mp4解复用器导致内存增长的bug:#895 2021-06-10 14:45:26 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xia-chu
5c90a1e137 完善nack与丢包重传 2021-05-11 11:18:55 +08:00
xia-chu
dbf2cd013c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-28 18:02:02 +08:00
xiongziliang
61afc57ed1 修复编译问题 2021-04-27 23:05:04 +08:00
xia-chu
cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-26 19:50:17 +08:00
xia-chu
af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu
48338af700 完善FCI相关代码 2021-04-23 15:06:55 +08:00
xia-chu
5db6154707 添加TWCC部分代码 2021-04-22 11:43:33 +08:00
xia-chu
cce9de74d3 完善rtcp nack相关代码 2021-04-20 17:15:01 +08:00
xia-chu
765db1eb8b 添加rtcp fci相关代码 2021-04-14 18:39:21 +08:00
xiongziliang
5064137a22 简化代码 2021-03-07 10:05:52 +08:00
xiongziliang
bd9769d215 兼容rtmps rtsps的推流地址 2021-03-07 10:04:58 +08:00
xia-chu
b0e1d5d6aa 重写rtp去冲突逻辑 2021-02-06 20:10:32 +08:00
xiongziliang
ddd3438fc3 添加bom头 2021-01-31 20:46:55 +08:00
xiongziliang
5175c52abe 修复编译警告 2021-01-31 19:45:12 +08:00
xiongziliang
5c6560f55d 重写rtcp框架 2021-01-31 19:33:33 +08:00
xiongziliang
4c1f7babad 完善代码 2021-01-31 18:24:41 +08:00
xiongziliang
fc8462bef1 完善性能测试工具 2021-01-23 09:42:45 +08:00
xia-chu
b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
fb1e35a39a 添加bom头 2021-01-17 10:35:01 +08:00
xiongziliang
03d0b6a9ed 添加拉流代理性能测试工具 2021-01-17 10:32:33 +08:00
xiongziliang
13221ad796 http回复根据状态码自动生成status message: #602 2021-01-02 21:24:06 +08:00
xiongziliang
fcf641dfb6 优化rtp排序算法 2020-10-17 14:46:59 +08:00