ziyue
|
f5f58196b5
|
修改常量命名
|
2021-10-16 16:58:03 +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
|
b1666eb651
|
实现媒体源pause/speed接口:#1129
|
2021-09-29 00:16:56 +08:00 |
|
ziyue
|
e9008afca0
|
addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口
|
2021-09-27 13:12:53 +08:00 |
|
ziyue
|
4dbe0a1d3e
|
合并pr：#1025
|
2021-08-12 20:37:46 +08:00 |
baiyfcu
|
0ed902509a
|
player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件
|
2021-08-09 18:28:43 +08:00 |
|
ziyue
|
566a49e227
|
修复getMediaTracks接口相关功能
|
2021-07-20 13:15:57 +08:00 |
|
ziyue
|
4b34e58d3c
|
移除MultiMuxerPrivate对象，修复rtp发送时无sps pps帧的问题
|
2021-07-20 12:42:53 +08:00 |
|
ziyue
|
c8f00cefa0
|
完善获取flv是否包含音视频相关逻辑
|
2021-07-15 11:29:21 +08:00 |
|
ziyue
|
fe42ea30fc
|
整理flv复用器
|
2021-07-15 11:16:11 +08:00 |
yangkun
|
03f6f4c4c0
|
fix publish type
|
2021-07-09 14:58:58 +08:00 |
|
ziyue
|
3165a2f81c
|
修改服务器版本信息声明相关代码
|
2021-06-29 11:16:05 +08:00 |
|
ziyue
|
307be4339f
|
Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test
|
2021-06-23 17:32:09 +08:00 |
|
xiongziliang
|
ce2122d3b6
|
优化rtmp chunk相关处理代码
|
2021-06-22 10:39:16 +08:00 |
|
ziyue
|
caecfc3fda
|
Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev
|
2021-06-21 17:51:15 +08:00 |
|
ziyue
|
f8467f21fb
|
推流失败时打印日志
|
2021-06-17 11:34:24 +08:00 |
|
ziyue
|
a67246f57e
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-06-16 10:40:17 +08:00 |
baiyfcu
|
ca192a4286
|
H265 I帧多slice情况下导致花屏问题
H265 I帧分片多包情况下，GPO缓冲只保存了I帧最后一个分片导致花屏
|
2021-06-09 09:51:28 +08:00 |
|
ziyue
|
0593f65fcb
|
完善代码
|
2021-06-08 14:50:12 +08:00 |
xgj
|
8721c5a62b
|
for joy4 rtmp push onMetaData compatibility
|
2021-06-08 10:07:51 +08:00 |
|
xia-chu
|
0bb87858a3
|
提升单track情况下秒开体验
|
2021-04-20 17:53:43 +08:00 |
|
xiongziliang
|
7884338b60
|
修复rtmp协议amf3不兼容的bug
|
2021-04-18 21:02:01 +08:00 |
|
xiongziliang
|
d2fec801c9
|
兼容不规范的rtmp推流器：#764
|
2021-04-01 22:03:21 +08:00 |
|
xiongziliang
|
f2edf354de
|
rtmp支持更新config帧
|
2021-03-21 16:50:15 +08:00 |
|
xiongziliang
|
43828d4390
|
兼容某些rtmp流
|
2021-03-07 10:04:27 +08:00 |
|
xia-chu
|
e4904623a7
|
修复rtmp兼容性bug
|
2021-02-07 23:01:22 +08:00 |
|
xia-chu
|
80bcf53ccf
|
更新ZLToolKit并适配代码
|
2021-02-06 20:10:34 +08:00 |
|
xia-chu
|
14b318525e
|
添加rtp rtmp个数统计
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
62ba87dd0f
|
优化frame性能及整理代码
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
bc6286553a
|
优化rtmp性能
|
2021-02-06 20:10:31 +08:00 |
|
xia-chu
|
2b3ce0ec63
|
流量统计事件确保0字节时也能触发
|
2021-02-06 20:10:31 +08:00 |
|
xiongziliang
|
272d1a8bd9
|
兼容一些rtmp推流器: #692
|
2021-01-23 10:06:38 +08:00 |
|
xia-chu
|
f63b2b1863
|
去除编译警告，修复bug
|
2021-01-19 16:05:38 +08:00 |
|
xiongziliang
|
5d752c89b5
|
修复编译问题
|
2021-01-17 20:15:08 +08:00 |
|
xia-chu
|
b6cbc87712
|
全面整理代码，去除编译警告
|
2021-01-17 18:31:50 +08:00 |
|
xiongziliang
|
d879c5901d
|
延迟清空状态
|
2021-01-17 10:28:06 +08:00 |
|
xiongziliang
|
b7d1a5059a
|
提高rtmp协议兼容性
|
2020-12-13 09:51:08 +08:00 |
|
xiongziliang
|
55cf411c1e
|
支持bitrate
|
2020-12-05 12:22:17 +08:00 |
|
xiongziliang
|
bb9b39d821
|
添加按需转协议开关，默认一直转协议：#569
|
2020-11-15 00:40:46 +08:00 |
|
xiongziliang
|
700a16c759
|
大幅提升接收推流性能以及降低内存占用
|
2020-11-01 03:41:35 +08:00 |
|
xiongziliang
|
38a002646d
|
修复FFmpeg拉流代理功能缺陷的问题：#533
|
2020-10-24 23:31:58 +08:00 |
|
xiongziliang
|
02c4aa3f4b
|
优化代码
|
2020-10-24 23:28:25 +08:00 |
|
xiongziliang
|
2965248346
|
修复std::move后智能指针无效的问题
|
2020-10-10 18:44:48 +08:00 |
|
xiongziliang
|
dfaa8b540c
|
使用临时变量和std::move减少智能指针的拷贝构造
|
2020-10-10 18:23:25 +08:00 |
|
xiongziliang
|
7f3877e437
|
添加网速统计功能
|
2020-10-01 11:02:00 +08:00 |
|
xiongziliang
|
5cd8e8ae1c
|
添加媒体生成源信息
|
2020-09-27 11:32:49 +08:00 |
|
xiongziliang
|
be1e872f0c
|
完善按需转协议(包括hls)
|
2020-09-12 19:20:18 +08:00 |
|
xiongziliang
|
9e26a02fb1
|
实现rtsp/rtmp按需转协议功能
|
2020-09-12 19:09:56 +08:00 |
|
xiongziliang
|
c711eedaa7
|
适配ZLToolKit代码,支持自定义创建Socket:#468
|
2020-09-12 19:03:52 +08:00 |
|
xiongziliang
|
0878f776b3
|
修复某些场景下rtmp定位关键帧不准确的bug
|
2020-09-06 18:22:04 +08:00 |
|
xiongziliang
|
ac70597216
|
优化getTrack接口相关代码
|
2020-09-06 17:54:52 +08:00 |
|
xiongziliang
|
28262b158f
|
优化性能
|
2020-09-06 17:53:22 +08:00 |
|
xiongziliang
|
636068b2b8
|
精简代码，改善代码结构
|
2020-09-06 17:52:33 +08:00 |
|
xiongziliang
|
a7e99b9d37
|
整理代码
|
2020-08-30 11:40:03 +08:00 |
|
xiongziliang
|
fbd711a6bb
|
整理代码
|
2020-08-30 10:48:34 +08:00 |
|
xiongziliang
|
f23e117751
|
MultiMediaSourceMuxer默认能处理大部分事件
|
2020-08-08 12:20:13 +08:00 |
|
xiongziliang
|
47cc97f696
|
修复rtmp增长时间戳相关问题
|
2020-08-04 11:10:40 +08:00 |
|
xiongziliang
|
a22f97c777
|
rtsp/rtmp/mp4支持opus并整理代码
|
2020-08-01 10:22:12 +08:00 |
|
xiongziliang
|
b4a3b608ab
|
修复rtmp增长时间戳相关bug
|
2020-08-01 10:20:27 +08:00 |
lyg1949
|
f420509c5c
|
修复点播rtmp时多出一个后缀名的bug
vlc，mpv等播放rtmp时的url规则与代码中注释的不同，导致出现2个后缀名
|
2020-07-15 14:17:18 +08:00 |
|
xiongziliang
|
1c19394b3d
|
防止rtmp协议重复生成Track
|
2020-07-08 21:39:30 +08:00 |
|
xiongziliang
|
66c5a7169a
|
修复metadata中没duration导致播放失败的bug:#362
|
2020-06-24 11:02:35 +08:00 |
|
xiongziliang
|
b7049b1407
|
精简代码
|
2020-05-30 14:43:08 +08:00 |
|
xiongziliang
|
de96a4f0c8
|
优化代码
|
2020-05-28 18:19:39 +08:00 |
|
xiongziliang
|
406c5477e0
|
无metadata且不能获取Track的rtmp确保能注册
|
2020-05-28 18:01:03 +08:00 |
|
xiongziliang
|
41509800bc
|
完善对无metadata的rtmp流的兼容性
|
2020-05-28 17:03:12 +08:00 |
|
xiongziliang
|
dea36cfc84
|
优化合并写逻辑，确保GOP缓存第一帧为关键帧并确保音视频数据的交织性
|
2020-05-27 11:09:02 +08:00 |
|
xiongziliang
|
ff7914e441
|
修改MediaSource相关接口
|
2020-05-26 10:11:58 +08:00 |
|
xiongziliang
|
68d910e229
|
限制rtsp/rtmp推流url合法性
|
2020-05-25 16:40:41 +08:00 |
|
xiongziliang
|
1970f6014e
|
优化音视频同步
|
2020-05-15 18:08:54 +08:00 |
|
xiongziliang
|
625d7e30c0
|
整理和精简代码
|
2020-05-11 22:33:10 +08:00 |
|
xiongziliang
|
a4d7b3463e
|
rtmp播放时，取相对时间戳逻辑确保时间戳同步
|
2020-05-06 18:54:28 +08:00 |
|
xiongziliang
|
3630839bc9
|
关闭转协议后，将关闭解复用以提供性能
|
2020-04-29 11:59:45 +08:00 |
|
xiongziliang
|
7e85be7654
|
添加rtmps服务器
|
2020-04-29 11:25:15 +08:00 |
|
xiongziliang
|
f9df7f5217
|
去除ultraLowDelay配置项
|
2020-04-29 11:08:43 +08:00 |
|
xiongziliang
|
e85a8f277e
|
RTMP协议限制G711规格、日志打印codec相关信息
|
2020-04-24 15:08:28 +08:00 |
|
xiongziliang
|
b4228f91c3
|
适配ZLToolKit
|
2020-04-24 12:39:22 +08:00 |
|
xiongziliang
|
eda7a59f3c
|
统一事件参数类型
|
2020-04-23 22:04:59 +08:00 |
|
xiongziliang
|
b6946a5968
|
事件广播触发者改成SockInfo对象
|
2020-04-23 21:38:44 +08:00 |
|
xiongziliang
|
4d84661a87
|
更新ZLToolKit
|
2020-04-23 17:50:12 +08:00 |
|
xiongziliang
|
bacf8f100b
|
G711支持多种规格
|
2020-04-18 22:13:11 +08:00 |
|
xiongziliang
|
5c3418a412
|
合并 #278
|
2020-04-18 18:46:20 +08:00 |
|
xiongziliang
|
1f43359b31
|
Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit
|
2020-04-18 16:05:49 +08:00 |
|
baiyfcu
|
40afa204d5
|
增加rtmp/rtsp对音频G711A,G711U的支持
|
2020-04-17 17:47:10 +08:00 |
|
xiongziliang
|
99a55ddaaa
|
添加合并写功能
|
2020-04-09 16:19:03 +08:00 |
|
xiongziliang
|
0fc1499643
|
添加性能测试模式
|
2020-04-08 11:16:09 +08:00 |
|
xiongziliang
|
d3db5e0ce0
|
完善录制相关功能
|
2020-04-05 09:48:38 +08:00 |
|
xiongziliang
|
e5d5cabf89
|
部分恢复录制相关接口
|
2020-04-05 09:26:29 +08:00 |
|
xiongziliang
|
83400290a8
|
整理rtmp相关代码
|
2020-04-04 22:54:49 +08:00 |
|
xiongziliang
|
7019e4717c
|
整理授权协议
|
2020-04-04 20:30:09 +08:00 |
|
xiongziliang
|
11420b868b
|
整理代码
|
2020-04-04 19:55:11 +08:00 |
|
xiongziliang
|
708300951b
|
优化rtmp点播
|
2020-04-04 15:37:37 +08:00 |
|
xiongziliang
|
ace200716a
|
修复无人播放事件触发延时不准确的bug
|
2020-03-23 10:21:17 +08:00 |
|
xiongziliang
|
1168174c2b
|
tab统一替换为4个空格键：#242
|
2020-03-20 11:51:24 +08:00 |
|
xiongziliang
|
a7a376b3f2
|
流量汇报事件添加id参数
|
2020-02-13 12:10:08 +08:00 |
|
xiongziliang
|
7e25537957
|
流量汇报事件添加客户端ip和端口参数
|
2020-02-13 11:33:59 +08:00 |
|
xiongziliang
|
92f69c3915
|
优化纯音频流的延时
|
2020-01-24 22:16:28 +08:00 |
|
xiongziliang
|
f5187e8b0d
|
优化GOP相关逻辑
|
2020-01-20 16:22:25 +08:00 |
|
xiongziliang
|
2610ba7c8b
|
修复rtmp注册时还未生成完整config包的bug
|
2020-01-15 11:46:15 +08:00 |
|
xiongziliang
|
444137e5b7
|
重写GOP缓存机制
|
2020-01-15 11:07:55 +08:00 |