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 |
|
xiongziliang
|
b55db11de3
|
解决rtmp过早注册的问题
|
2020-01-13 15:48:55 +08:00 |
|
xiongziliang
|
653132b38c
|
去除多余日志
|
2020-01-08 14:03:56 +08:00 |
|
xiongziliang
|
ab32ca39a9
|
去除多余日志
|
2020-01-08 14:00:53 +08:00 |
|
xiongziliang
|
1ce9af35e3
|
1、复用rtsp url解析代码
2、修复rtsp/rtmp推流异常回调紊乱的问题
|
2020-01-04 12:03:53 +08:00 |
|
xiongziliang
|
e91c26c052
|
实现hls的流量汇报事件
|
2019-12-29 15:38:29 +08:00 |
|
xiongziliang
|
54736859d4
|
基本完成hls相关的主要事件
|
2019-12-29 10:49:04 +08:00 |
|
xiongziliang
|
e72fa359b6
|
完善hls播放器个数计数
|
2019-12-28 16:57:35 +08:00 |
|
xiongziliang
|
94806b2cd6
|
初步实现hls播放器个数计数
|
2019-12-28 16:48:11 +08:00 |
|
xiongziliang
|
a30a4e24f1
|
修复rtsp推流转协议失败的bug
|
2019-12-26 12:20:34 +08:00 |
|
xiongziliang
|
453660ab79
|
整理MediaSource派生类
修复转协议或录制时忽然Track的问题
|
2019-12-26 12:10:54 +08:00 |
|
xiongziliang
|
9e8fe8c86a
|
完善代码
|
2019-12-26 12:09:35 +08:00 |
|
xiongziliang
|
3830792c57
|
整理MediaSource派生类
修复转协议或录制时忽然Track的问题
|
2019-12-26 11:53:19 +08:00 |
|
xiongziliang
|
761a665b1b
|
删除冗余设计
|
2019-12-26 09:43:44 +08:00 |
|
xiongziliang
|
d59a706cc1
|
简化代码
|
2019-12-25 20:07:42 +08:00 |
|
xiongziliang
|
1bfe4937cd
|
整理MediaSource派生类代码
|
2019-12-25 11:04:12 +08:00 |
|
xiongziliang
|
bb4e8b73b5
|
兼容一些不规范的rtmp推流:#190
|
2019-12-25 10:13:59 +08:00 |
|
xiongziliang
|
de33d6a847
|
整理文件录制
|
2019-12-04 10:45:38 +08:00 |
|
xiongziliang
|
5249c24430
|
整理MediaSource代码
|
2019-12-03 16:10:02 +08:00 |
|
xiongziliang
|
c55f26fba7
|
整理MediaSink
|
2019-12-03 12:32:57 +08:00 |
|
xiongziliang
|
c42ee1dc5d
|
优化时间戳覆盖逻辑:#148
|
2019-11-29 09:54:48 +08:00 |
|
xiongziliang
|
54f2c0b53c
|
兼容一些奇怪sdp的rtsp url
|
2019-11-21 16:31:50 +08:00 |
|
xiongziliang
|
e6d511cc9e
|
解决播放成功与中途断开事件触发紊乱的问题:#143
|
2019-11-19 15:52:02 +08:00 |
|
xiongziliang
|
a8a4f267f7
|
添加配置项，控制在关闭hook时，推流是否转协议或录制
|
2019-11-08 15:54:13 +08:00 |
|
xiongziliang
|
a739bd7304
|
完善日志
|
2019-10-23 12:00:53 +08:00 |
|
xiongziliang
|
08386b958c
|
覆盖时间戳需要明确参数指定，防止误判
|
2019-10-12 22:44:16 +08:00 |
|
xiongziliang
|
fd89b2d0cf
|
MediaServer支持Android
|
2019-09-24 15:21:20 +08:00 |
|
xiongziliang
|
8552687559
|
提高对无Metadata的rtmp流的兼容性
|
2019-09-24 11:44:23 +08:00 |
|
xiongziliang
|
653667baf5
|
提高对无Metadata的rtmp流的兼容性
|
2019-09-24 11:42:27 +08:00 |
|
xiongziliang
|
928f642a27
|
完善注册rtmp机制，防止及时拉流不出画面的bug
|
2019-09-23 18:56:19 +08:00 |
|
xiongziliang
|
adfc084d4a
|
提高无Metadata的rtmp推流的兼容性
|
2019-09-23 17:08:00 +08:00 |
|
xiongziliang
|
1fda56ab6e
|
rtmp推流时，确保config帧收完后再注册
|
2019-09-23 16:53:04 +08:00 |
|
xiongziliang
|
cb7c72d9d9
|
修正metadata拼写错误，优化RtmpMediaSource注册机制，修复及时拉流不出画面的bug
|
2019-09-23 16:47:20 +08:00 |