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

3989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
johzzy
2ec3b0ccea
增加 WebRtcTransportManager (#1156) 
增加 WebRtcTransportManager
 2021-10-13 14:15:29 +08:00
ziyue
acbe99cb43 整理优化webrtc ssrc与simulcast相关代码 2021-10-12 21:26:01 +08:00
ziyue
fbc5378058 合并webrtc相关pr:#1154 2021-10-12 17:32:22 +08:00
Johnny
2a906ad04a 保留 WebRtcTransport::onCheckSdp 接口。 2021-10-12 17:07:04 +08:00
Johnny
0f4289a584 Refine(webrtc/sdp): 函数 WebRtcTransport::onCheckSdp() 拆分为WebRtcTransport::onCheckAnswer() 和 RtcSession::checkSdp() 2021-10-12 16:15:37 +08:00
Johnny
c7633fb5bb Refine(webrtc/sdp): 移除getSdp(SdpType type)。相较而言，直接使用_offer_sdp 和 _answer_sdp 更好。 2021-10-12 15:35:18 +08:00
ziyue
712bdf7310 添加utf8 bom头，防止windows下编译不过 2021-10-11 17:17:39 +08:00
xiongziliang
8d85e6cee0 修复linux下编译问题 2021-10-07 16:12:42 +08:00
xiongziliang
645b9c0791 支持twcc动态调整码率 2021-10-07 15:53:07 +08:00
xiongziliang
438fd952f2 前移时间戳生成逻辑，防止耗时代码干扰时间戳精度 2021-10-07 15:49:33 +08:00
xiongziliang
29cc6a94f2 初步实现twcc rtcp发送 2021-10-07 15:39:02 +08:00
xiongziliang
ea1fa03f13 修复twcc fci生成相关bug 2021-10-07 15:39:02 +08:00
xiongziliang
0ae1d46892 基本完成twcc rtcp fci的生成 2021-10-07 12:28:59 +08:00
xiongziliang
e02bc9ce67 修复twcc StatusVecChunk生成相关bug 2021-10-07 12:26:16 +08:00
xiongziliang
dbc377a1f9 初步添加twcc rtcp发送逻辑 2021-10-06 22:42:17 +08:00
xiongziliang
fc5b09365e 修复rtp ext解析相关bug 2021-10-06 22:10:54 +08:00
xiongziliang
b62bd910a2 修复android下编译问题:#1141 2021-10-03 19:48:09 +08:00
ziyue
15edbeac3e 整理http相关代码 2021-09-30 16:10:09 +08:00
夏楚
a548fcd709
Feature/dev (#1143) 
* 防止每次cmake后导致重复编译
 2021-09-30 11:27:42 +08:00
夏楚
a83187d25f
Merge pull request #1142 from mingyuejingque/master 
修正Release 和 Debug编译选项
 2021-09-29 17:24:08 +08:00
明月惊鹊
2bb9003ac5
修正Release 和 Debug编译选项 
根据传入的 -DCMAKE_BUILD_TYPE=Release 或者Debug， 或者不写（默认是Debug） 来决定生成何种编译文件。
 2021-09-29 17:06:11 +08:00
haorui wang
adc6f652bd
修复zlm推流FMS,修正zlm的RTMP协议 (#1140) 
* 修复zlm推流FMS,修正zlm的RTMP协议
Co-authored-by: 夏楚 <771730766@qq.com>
 2021-09-29 16:57:19 +08:00
xiongziliang
1292ec6d49 未指定编译类型时,强制为Debug编译 2021-09-29 01:18:58 +08:00
xiongziliang
4ff206fa42 兼容一些不规范的rtsp sdp: #1128 2021-09-29 01:16:52 +08:00
xiongziliang
892e151063 响应http head命令后不关闭socket:#1136 2021-09-29 00:46:09 +08:00
xiongziliang
50c45d7897 删除不必要的文件或代码 2021-09-29 00:41:39 +08:00
xiongziliang
146fdf48d4 新增作者 2021-09-29 00:41:10 +08:00
xiongziliang
8d2d1e135c 修改rtsp点播ntp时间戳 2021-09-29 00:25:34 +08:00
xiongziliang
b1666eb651 实现媒体源pause/speed接口:#1129 2021-09-29 00:16:56 +08:00
xiongziliang
507eadf20b Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-09-28 22:49:59 +08:00
xiongziliang
7d1b2583e6 优化代码 2021-09-28 22:44:02 +08:00
xiongziliang
305d9bc259 完善twcc rtcp包相关代码 2021-09-28 22:44:02 +08:00
cgm
8b1bccdd00 api增加log日志文件参数设置 2021-09-28 09:52:29 +08:00
ziyue
10c4608630 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-09-27 20:14:32 +08:00
ziyue
c09eb48724 修复udp服务器启动失败时访问空指针的bug 2021-09-27 20:11:39 +08:00
夏楚
16411e1af1
Merge pull request #1137 from ZLMediaKit/feature/add_mute_audio 2021-09-27 16:55:19 +08:00
ziyue
3bc0769ccb 完善mk_media接口 2021-09-27 14:34:26 +08:00
ziyue
c493f0da1b 完善添加静音音频相关功能 2021-09-27 14:12:11 +08:00
ziyue
e20718fbde 确保静音音频track不影响后续添加的正常音频track 2021-09-27 13:27:07 +08:00
ziyue
afec4b62b9 全局自动添加静音音频 2021-09-27 13:20:34 +08:00
ziyue
e9008afca0 addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
ziyue
1f99708548 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-09-24 18:09:30 +08:00
ziyue
00f01afec7 修复webrtc相关漏洞:#1110 2021-09-24 11:29:04 +08:00
夏楚
07b0536f72
Merge pull request #1126 from johzzy/feature/ccache 
增加ccache编译加速
 2021-09-22 17:46:57 +08:00
Johnny
1d648e9ae5 增加ccache编译加速 2021-09-22 17:37:56 +08:00
夏楚
03aa9290ab
Merge pull request #1112 from ZLMediaKit/feature/update_rtcsdkdemo 
update zlm rtc sdk demo
 2021-09-17 14:08:00 +08:00
xgj
ef213f16a7 warning when access rtc demo when http site and auto get url of site to anti mistake operation 2021-09-17 11:59:01 +08:00
xgj
e2cc9ecd92 update zlm rtc sdk demo 2021-09-17 11:20:23 +08:00
夏楚
2b3d32f6c6
Merge pull request #1108 from brokensword2018/fix_warning 
去除非第三方库的编译告警
 2021-09-16 17:39:55 +08:00
hejilin
dcb775c6e8 去除非第三方库的编译告警 2021-09-16 16:00:46 +08:00