amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 03:30:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,769 Commits 16 Branches 0 Tags 225 MiB
a46218965a
Commit Graph

1769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
a4d7b3463e rtmp播放时，取相对时间戳逻辑确保时间戳同步 2020-05-06 18:54:28 +08:00
xiongziliang
920f06a996 AAC sdp添加通道数 2020-04-30 13:35:38 +08:00
xiongziliang
3ad1fe4924 支持265解码 2020-04-30 12:52:13 +08:00
xiongziliang
787081eb0c 修复websocket服务器可能存在的bug 2020-04-30 10:31:32 +08:00
xiongziliang
c64d1a3ad8 完善 2020-04-30 10:02:27 +08:00
xiongziliang
b649372873 修复split 264/265相关逻辑的bug 2020-04-30 10:00:55 +08:00
baiyfcu
6518e5d448
Merge pull request #16 from xiongziliang/master 
update
 2020-04-29 18:26:06 +08:00
xiongziliang
1067c5a2d3 再优化dts获取 2020-04-29 18:19:51 +08:00
xiongziliang
9d9f6e304e 完善dts计算算法 2020-04-29 18:05:29 +08:00
xiongziliang
3630839bc9 关闭转协议后，将关闭解复用以提供性能 2020-04-29 11:59:45 +08:00
xiongziliang
0270057907 新增rtmps默认端口 2020-04-29 11:30:06 +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
4fbd45e408 h265新增支持两种类型的关键帧 2020-04-29 10:01:56 +08:00
xiongziliang
163b0875cf 修复h264 split后可能多个字节的bug 2020-04-28 22:24:31 +08:00
xiongziliang
7565a20695 startRecord API with "customized_path" #279 2020-04-28 15:24:08 +08:00
xiongziliang
0eb97d5471 修复不能控制录制路径的问题：#279 2020-04-28 09:40:47 +08:00
xiongziliang
aa9bd56c5a 回调可以设置空指针 2020-04-27 09:18:46 +08:00
baiyfcu
7490f320f8
Merge pull request #15 from xiongziliang/master 
update
 2020-04-26 22:35:29 +08:00
xiongziliang
7272f01ea9 确保能同步取消定时器 2020-04-26 19:36:17 +08:00
xiongziliang
341bb5d84a 确保定时器能同步取消 2020-04-26 19:34:58 +08:00
xiongziliang
3651609a5f 确保mk_player_release后不再触发回调 2020-04-26 19:09:38 +08:00
xiongziliang
ff7cf5f4d3 完善注释 2020-04-26 19:04:47 +08:00
xiongziliang
dee0af1c40 Merge remote-tracking branch 'origin/master' 2020-04-26 19:02:49 +08:00
xiongziliang
e141eeb8b8 同步取消回调 2020-04-26 19:02:40 +08:00
baiyfcu
98d0bc27f9 mk_player api 增加seek和获取进度以相对开始时间的接口以适应按时间轴方式回放的需求 2020-04-26 17:40:34 +08:00
夏楚
42b89a4da1
Update README.md 2020-04-26 17:40:09 +08:00
baiyfcu
12eabbe426
Merge pull request #14 from xiongziliang/master 
update
 2020-04-26 15:30:28 +08:00
xiongziliang
75cc34814f 保证不丢帧 2020-04-26 15:19:32 +08:00
xiongziliang
b2fe3cd05d 加锁 2020-04-26 11:25:25 +08:00
xiongziliang
2c9141513d ts/ps支持G711 2020-04-26 09:45:00 +08:00
xiongziliang
b2b276029b 修复windows下编译问题 2020-04-24 16:35:41 +08:00
xiongziliang
f222af2632 完善代码 2020-04-24 15:28:27 +08:00
xiongziliang
e85a8f277e RTMP协议限制G711规格、日志打印codec相关信息 2020-04-24 15:08:28 +08:00
xiongziliang
46740b7c31 修复编译问题 2020-04-24 14:13:50 +08:00
xiongziliang
bda57b57f2 修复内存失效的问题 2020-04-24 14:06:28 +08:00
xiongziliang
2e74d5c957 修复合并写相关bug: #282 2020-04-24 13:51:04 +08:00
xiongziliang
3cdc0dd98f 更新ZLToolKit 2020-04-24 12:45:21 +08:00
xiongziliang
79949fc05f Merge remote-tracking branch 'origin/master' 2020-04-24 12:39:34 +08:00
xiongziliang
b4228f91c3 适配ZLToolKit 2020-04-24 12:39:22 +08:00
夏楚
540faa8c24
Update README_en.md 2020-04-24 10:12:21 +08:00
夏楚
48e6fecbc0
Update README.md 2020-04-24 10:11:45 +08:00
xiongziliang
a9fcd9dbc1 完善接口 2020-04-23 23:57:42 +08:00
xiongziliang
787af5109e api返回音视频相关信息 2020-04-23 23:45:20 +08:00
xiongziliang
1c03acbdb9 完善网络相关信息 2020-04-23 23:33:58 +08:00
xiongziliang
26cfb5ae73 完善网络相关信息 2020-04-23 23:30:24 +08:00
xiongziliang
0df25942aa rtp推流初步添加事件 2020-04-23 23:18:24 +08:00
xiongziliang
00c21cd99e 优化代码 2020-04-23 22:22:24 +08:00
xiongziliang
eda7a59f3c 统一事件参数类型 2020-04-23 22:04:59 +08:00
xiongziliang
b6946a5968 事件广播触发者改成SockInfo对象 2020-04-23 21:38:44 +08:00