xia-chu
|
38894097ae
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-09 10:47:14 +08:00 |
|
夏楚
|
67eb75048c
|
Update README.md
|
2021-04-08 18:11:21 +08:00 |
|
xia-chu
|
67e1b1f194
|
媒体注册hook添加编码等信息
|
2021-04-08 17:34:46 +08:00 |
|
xiongziliang
|
b2afae0e8a
|
暂时屏蔽一些日志
|
2021-04-07 21:02:28 +08:00 |
|
xiongziliang
|
1650f63af5
|
生成answer sdp失败时,立即销毁对象
|
2021-04-07 20:41:17 +08:00 |
|
xiongziliang
|
fb9eefca69
|
完善日志
|
2021-04-07 20:40:42 +08:00 |
|
xiongziliang
|
87e1209d0a
|
修复某些平台下,udp connect后sendto时指定对端地址发送失败的问题
|
2021-04-07 20:33:53 +08:00 |
|
xia-chu
|
a22a6bafb7
|
添加流量统计事件
|
2021-04-07 18:35:38 +08:00 |
|
xia-chu
|
0c5fa36e4d
|
rtc推流添加媒体事件相关接口
|
2021-04-07 18:18:27 +08:00 |
|
xia-chu
|
155c59e17e
|
添加rtc类型的推流
|
2021-04-07 18:17:49 +08:00 |
|
xia-chu
|
b96052d387
|
完善rtc异常管理
|
2021-04-07 17:51:47 +08:00 |
|
xia-chu
|
d354c9466c
|
rtc添加对rtcp bye支持
|
2021-04-07 17:21:59 +08:00 |
|
xia-chu
|
f374f72312
|
添加rtcp bye相关代码
|
2021-04-07 16:58:05 +08:00 |
|
xiongziliang
|
79267ae551
|
比对codec失败时,先关闭profile比对,再关闭codec比对
|
2021-04-06 23:47:54 +08:00 |
|
xiongziliang
|
b5e6c12ee8
|
H264 profile比对不区分大小写
|
2021-04-06 23:46:45 +08:00 |
|
xiongziliang
|
c9a20eda16
|
profile匹配失败时,优先选择相同编码格式的方案
|
2021-04-06 23:22:22 +08:00 |
|
xiongziliang
|
204ef6e204
|
匹配H264 profile
|
2021-04-06 23:21:46 +08:00 |
|
xiongziliang
|
a42b56ba94
|
兼容Firefox
|
2021-04-06 22:51:16 +08:00 |
|
ziyue
|
b5bf930467
|
调整cmake
|
2021-04-06 18:30:36 +08:00 |
|
ziyue
|
9c552128a7
|
修复sdp中没ssrc时触发的bug
|
2021-04-06 18:29:14 +08:00 |
|
ziyue
|
8edd093d68
|
添加bom头
|
2021-04-06 17:23:13 +08:00 |
|
xiongziliang
|
50ca789c0c
|
预留同时推流拉流的接口
|
2021-04-05 11:32:38 +08:00 |
|
xiongziliang
|
606f251311
|
修复音频相关的bug
|
2021-04-05 11:07:41 +08:00 |
|
xiongziliang
|
ce04a7279c
|
优化代码
|
2021-04-05 00:12:46 +08:00 |
|
xiongziliang
|
3c935e7fdd
|
优化代码
|
2021-04-05 00:06:21 +08:00 |
|
xiongziliang
|
6070654860
|
rtc播放时,比对采样率等信息
|
2021-04-04 23:58:59 +08:00 |
|
xiongziliang
|
fe02f2cf1c
|
rtc推流和播放添加事件触发
|
2021-04-04 23:20:10 +08:00 |
|
xiongziliang
|
49d8e2f825
|
http请求最大允许40KB数据
|
2021-04-04 23:17:11 +08:00 |
|
xiongziliang
|
09add8d351
|
修改为捕捉摄像头
|
2021-04-04 23:14:42 +08:00 |
|
xiongziliang
|
5f0aeaa32a
|
区分推流和播放
|
2021-04-04 23:13:01 +08:00 |
|
xiongziliang
|
f33d3ba175
|
还原配置文件
|
2021-04-04 23:12:35 +08:00 |
|
xiongziliang
|
c70721a520
|
修改rtp pt时,确保不影响其他播放器
|
2021-04-04 21:42:11 +08:00 |
|
xiongziliang
|
2abb5078f9
|
实现rtc转rtsp
|
2021-04-03 09:34:49 +08:00 |
|
xiongziliang
|
130a06897f
|
整理并注释代码
|
2021-04-03 08:45:18 +08:00 |
|
xiongziliang
|
cfda7d8ba6
|
整理代码并完善rtcp相关功能
|
2021-04-03 08:32:20 +08:00 |
|
xiongziliang
|
e9c963dc82
|
添加部分rtcp代码
|
2021-04-03 00:04:52 +08:00 |
|
xiongziliang
|
a176cb83a8
|
预留rtcp相关代码
|
2021-04-02 23:12:37 +08:00 |
|
xiongziliang
|
8c460bfcff
|
基本完成rtc转rtsp
|
2021-04-02 23:01:58 +08:00 |
|
xiongziliang
|
dc485c6211
|
支持根据情况选择是否发生rtp
|
2021-04-02 21:08:40 +08:00 |
|
xiongziliang
|
c42b678cab
|
完成rtc发送
|
2021-04-02 20:35:43 +08:00 |
|
ziyue
|
4a62314be9
|
完善
|
2021-04-02 18:36:33 +08:00 |
|
ziyue
|
9a2f2cbf2e
|
完善rtsp sdp匹配
|
2021-04-02 18:28:01 +08:00 |
|
ziyue
|
ee072191e0
|
开始对接rtsp源
|
2021-04-02 17:56:24 +08:00 |
|
ziyue
|
7110dc75ae
|
整理代码
|
2021-04-02 17:08:11 +08:00 |
|
ziyue
|
33d2e71368
|
合并代码,去除冗余代码
|
2021-04-02 16:23:40 +08:00 |
|
xiongziliang
|
a328520c9c
|
buf fixed
|
2021-04-01 22:24:35 +08:00 |
|
xiongziliang
|
2434470fb8
|
G711强制规格
|
2021-04-01 22:20:29 +08:00 |
|
xiongziliang
|
d2fec801c9
|
兼容不规范的rtmp推流器:#764
|
2021-04-01 22:03:21 +08:00 |
|
xiongziliang
|
075756c4c6
|
提升兼容性:#789
|
2021-04-01 21:46:02 +08:00 |
|
xiongziliang
|
5539050f06
|
更新第三方库
|
2021-04-01 21:44:10 +08:00 |
|