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
2,744 Commits 16 Branches 0 Tags 225 MiB
e044d5cef9
Commit Graph

2744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ziyue
02bd01c83b 完善http option命令 2021-06-28 10:10:09 +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
xiongziliang
3f36a10bee Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-26 18:28:31 +08:00
夏楚
d3f81745fd
Merge pull request #936 from ZLMediaKit/feature/fix-workflow 
支持编译 WebRTC
 2021-06-26 18:16:45 +08:00
夏楚
c733e7af41
Merge pull request #935 from ZLMediaKit/feature/fix-compile 
调整链接顺序, 修正编译问题
 2021-06-26 18:16:05 +08:00
wxf
72e8b6efa4 支持集成 WebRTC 功能 2021-06-26 18:07:26 +08:00
wxf
0a7acf94d3 明确使用的编译服务器版本 2021-06-26 17:57:05 +08:00
wxf
b026634a3e 未启用 WebRTC 的情况下禁用相关测试用例 2021-06-26 17:10:42 +08:00
wxf
a92b02907d 调整链接顺序, 修正编译问题 
webrtc 依赖于 zlmediakit
 2021-06-26 16:56:56 +08:00
夏楚
4609716ba3
Merge pull request #933 from CharleyWangHZ/master 2021-06-26 03:55:17 +08:00
xiongguangjie
c0f362af33 for linux compile --start-group and --end-group 2021-06-25 22:03:52 +08:00
xiongguangjie
6d8d64caf6 for mergen 2021-06-25 21:24:53 +08:00
ziyue
8c670c652e 提前映射ssrc与rid的关系 2021-06-25 18:18:48 +08:00
ziyue
0f1d1ded7e rid支持更新 2021-06-25 18:08:03 +08:00
ziyue
365aead8b6 修复注释 2021-06-25 17:24:32 +08:00
ziyue
edf30a04cf 优化代码 2021-06-25 17:17:48 +08:00
ziyue
89ef183647 精简代码 2021-06-25 17:10:27 +08:00
ziyue
423dd454ca 整理代码 2021-06-25 17:02:58 +08:00
ziyue
76ebf02ced 记录所有rtp的ssrc 2021-06-25 16:57:38 +08:00
ziyue
a7f75774e9 整理RtpReceiver相关代码 2021-06-25 16:24:44 +08:00
ziyue
18b7e45906 整理nack相关代码 2021-06-25 15:43:47 +08:00
ziyue
7406281c96 抽象RtpExtContext对象 2021-06-25 15:31:13 +08:00
ziyue
964cf39145 RtcpContext修改时间戳单位、整理WebRTC相关代码 2021-06-25 14:59:27 +08:00
ziyue
6c01cf336e 抽象MediaTrack与RtpChannel对象 2021-06-25 14:37:11 +08:00
ziyue
ba672178b4 修复simulcast无法开启主码流的问题 2021-06-25 13:23:10 +08:00
CharleyWangHZ
332e8fa180
Update HttpSession.cpp 2021-06-25 11:17:21 +08:00
CharleyWangHZ
248c9e8f9a
Update HttpSession.h 2021-06-25 10:59:56 +08:00
CharleyWangHZ
e3d17848f6
Update HttpSession.cpp 2021-06-25 10:59:06 +08:00
xgj
e7e7906ecd for firefox ingore ssrc is 0 2021-06-25 10:08:53 +08:00
ziyue
ebb947c698 完善simulcast与ssrc相关处理代码 2021-06-24 17:54:16 +08:00
ziyue
3862c8f1da 删除多余行 2021-06-24 17:53:37 +08:00
ziyue
74a935a8cd 完善simulcast播放统计功能 2021-06-24 13:20:17 +08:00
ziyue
7a02d2c8d6 不支持的rtp方向，answer sdp设置为inactive 2021-06-24 13:09:51 +08:00
xgj
e9d28c1386 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-24 11:53:15 +08:00
ziyue
a91f4d29f2 完善simulcast接收及处理 2021-06-24 11:39:55 +08:00
ziyue
dcb91e3b50 初步支持simulcast流的接收和分流 2021-06-23 21:44:04 +08:00