amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
2,549 Commits 16 Branches 0 Tags 225 MiB
365aead8b6
Commit Graph

196 Commits

Author SHA1 Message Date
ziyue
a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
ziyue
24ab876fdb 修复重连时，创建多个mp4解复用器导致内存增长的bug:#895 2021-06-10 14:45:26 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xia-chu
5c90a1e137 完善nack与丢包重传 2021-05-11 11:18:55 +08:00
xia-chu
dbf2cd013c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-28 18:02:02 +08:00
xiongziliang
61afc57ed1 修复编译问题 2021-04-27 23:05:04 +08:00
xia-chu
cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-26 19:50:17 +08:00
xia-chu
af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu
48338af700 完善FCI相关代码 2021-04-23 15:06:55 +08:00
xia-chu
5db6154707 添加TWCC部分代码 2021-04-22 11:43:33 +08:00
xia-chu
cce9de74d3 完善rtcp nack相关代码 2021-04-20 17:15:01 +08:00
xia-chu
765db1eb8b 添加rtcp fci相关代码 2021-04-14 18:39:21 +08:00
xiongziliang
5064137a22 简化代码 2021-03-07 10:05:52 +08:00
xiongziliang
bd9769d215 兼容rtmps rtsps的推流地址 2021-03-07 10:04:58 +08:00
xia-chu
b0e1d5d6aa 重写rtp去冲突逻辑 2021-02-06 20:10:32 +08:00
xiongziliang
ddd3438fc3 添加bom头 2021-01-31 20:46:55 +08:00
xiongziliang
5175c52abe 修复编译警告 2021-01-31 19:45:12 +08:00
xiongziliang
5c6560f55d 重写rtcp框架 2021-01-31 19:33:33 +08:00
xiongziliang
4c1f7babad 完善代码 2021-01-31 18:24:41 +08:00
xiongziliang
fc8462bef1 完善性能测试工具 2021-01-23 09:42:45 +08:00
xia-chu
b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
fb1e35a39a 添加bom头 2021-01-17 10:35:01 +08:00
xiongziliang
03d0b6a9ed 添加拉流代理性能测试工具 2021-01-17 10:32:33 +08:00
xiongziliang
13221ad796 http回复根据状态码自动生成status message: #602 2021-01-02 21:24:06 +08:00
xiongziliang
fcf641dfb6 优化rtp排序算法 2020-10-17 14:46:59 +08:00
xiongziliang
4d39176877 重写rtp排序算法:#510 2020-10-01 21:33:07 +08:00
xiongziliang
9c873e1d19 去除转协议开关参数 2020-09-20 09:26:00 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
doodoocoder
2ae9d7c2ef
当用pkg-config找avcodec与avutil时，应该就AVCODEC_INCLUDE_DIRS,AVUTIL_INCLUDE_DIRS 
当用pkg-config找avcodec与avutil时，应该就AVCODEC_INCLUDE_DIRS,AVUTIL_INCLUDE_DIRS而不是AVCODEC_INCLUDE_DIR,AVUTIL_INCLUDE_DIR
 2020-09-10 13:35:35 +08:00
xiongziliang
fdbed9e83b 兼容一些不规范的rtmp流 2020-08-01 10:17:54 +08:00
xiongziliang
dae7516c55 完善对FFmpeg的支持 2020-08-01 10:16:28 +08:00
xiongziliang
248b2d5cb9 完善GB28181推流 2020-07-08 09:36:10 +08:00
xiongziliang
477f99b756 支持动态创建GB28181收流端口并可指定stream_id:#338 2020-07-07 10:01:12 +08:00
wxf
2fee173d7a 优先使用 pkg-config 来查找 AV* 库 
部分主机上 ffmpeg 安装路径不标准, 默认查找方式不方便适应该方式
 2020-07-02 16:21:27 +08:00
xiongziliang
72e8ab6ced 提高性能测试工具性能 2020-06-08 18:59:32 +08:00
xiongziliang
ebc1ee2c6e 代码优化 2020-05-28 12:44:25 +08:00
xiongziliang
5ae887a279 websocket客户端销毁时主动发送close信令: #311 2020-05-25 14:36:58 +08:00
xiongziliang
477475a60f 批量添加bom头、批量替换tab字符 2020-05-18 15:31:49 +08:00
xiongziliang
bab11b426e hls播放器通过测试 2020-05-17 19:06:14 +08:00
xiongziliang
3ad1fe4924 支持265解码 2020-04-30 12:52:13 +08:00
xiongziliang
26cfb5ae73 完善网络相关信息 2020-04-23 23:30:24 +08:00
xiongziliang
4d84661a87 更新ZLToolKit 2020-04-23 17:50:12 +08:00
xiongziliang
1d5c6cb141 整理解析器 2020-04-20 18:13:45 +08:00
xiongziliang
1f43359b31 Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit 2020-04-18 16:05:49 +08:00
baiyfcu
fb77293648 修复rtsp seek播放时rtsp server返回npt字段不对问题 2020-04-08 15:37:16 +08:00
xiongziliang
0fc1499643 添加性能测试模式 2020-04-08 11:16:09 +08:00
xiongziliang
7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang
cefb2a7cc4 hls/mp4录制不再能随时开启或关闭 2020-04-04 14:33:12 +08:00
xiongziliang
6e5cd0345d 优化点播相关代码 2020-04-03 23:27:16 +08:00