THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,013 Commits 17 Branches 0 Tags 222 MiB
Commit Graph

1629 Commits

Author SHA1 Message Date
ziyue 2e9ff3ed3c HLS: 修复hls直播ts/m3u8文件更新导致mmap失效，触发bus error的bug 2021-12-22 16:08:23 +08:00
ziyue fe575af0d8 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-12-22 14:06:46 +08:00
ziyue 6a044f0726 HLS: 修复http客户端连接复用导致hls播放异常的bug: #1294 2021-12-22 14:03:05 +08:00
xiongziliang ee13ca57c2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-12-17 22:40:42 +08:00
xiongziliang 0feac7c924 MP4: mp4开始点播确保MediaSource注册后再返回 2021-12-17 22:33:08 +08:00
alexliyu7352 0d5ef99724
http客户端支持简单验证协议 (#1289) 
* 加速track的准备速度

* 重命名为isAllTrackReady

* 无须缓冲帧时，暂不用转换为可缓存帧

* 支持简单验证协议

* 优化代码

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-17 17:48:05 +08:00
alexliyu7352 0b2e55429d
HLS: 加速track就绪速度 (#1286) 
* 加速track的准备速度

* 重命名为isAllTrackReady

* 无须缓冲帧时，暂不用转换为可缓存帧

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-17 14:47:17 +08:00
ziyue 5e2967d94a HLS: 合并hls m3u8刷新延时相关pr(#1281) 2021-12-17 11:40:54 +08:00
Alex 0c1159959c 拉去hls索引文件时, 不能仅仅只是按照m3u8文件中的分段时间来拉取, 这样在网络延迟的情况下很容易出现问题, 根据规范与ffmpeg中的实现修改如下 2021-12-17 02:04:28 +08:00
ziyue 120879df0f HTTP-FMP4: 修复http-fmp4直播秒开问题 2021-12-16 17:46:03 +08:00
ziyue 4291c31493 FMP4: http-fmp4直播提升流畅度 2021-12-16 12:09:49 +08:00
ziyue f4b6a6bd40 MP4: 修复mp4解复用定时器精度太高时读取文件太快的bug 2021-12-16 10:50:31 +08:00
ziyue b3dd440151 MP4Demuxer: MP4解复器支持获取track并添加frame输出回调 2021-12-15 20:51:26 +08:00
ziyue 283188bedb MP4Demuxer: 提高MP4解复用器接口灵活度 2021-12-15 20:50:35 +08:00
xiongguangjie 5bffc98541
hls 录像支持直播时移 (#1275) 
* hls live record support seek

* 调整代码风格

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-15 16:43:49 +08:00
xiongguangjie 50c6c2513d
修复rtsp tcp 推送到 rtsp-simple-server 失败的问题， (#1274) 
* for push rtsp  to rtsp-simple-server remeber annoce response sessionid and setup tcp add mode=record

* fix  push rtsp  to rtsp-simple-server over udp error add mode=record

* 优化代码

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-14 17:17:05 +08:00
Xiaofeng Wang 54367fef31
修正连 node ws 服务端失败问题 (#1262) 
Fix #1251

参考: https://datatracker.ietf.org/doc/html/rfc6455#section-4.2.1
Sec-WebSocket-Key base64 解码后长度应该是 16 字节.
 2021-12-08 14:17:34 +08:00
ziyue e483424858 Refine: 删除无效代码 2021-12-01 22:14:28 +08:00
ziyue c2b0f3c07b Refine: 修复hls播放器丢失首帧关键帧的问题 2021-12-01 22:09:05 +08:00
ziyue 8f60ec9900 Refine: 精简复用MediaSink相关代码 2021-12-01 21:38:31 +08:00
ziyue 84baf920c1 GB28181: ps解析失败触发断言时，丢弃所有数据 2021-12-01 17:02:06 +08:00
ziyue 78bcd9e868 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-11-30 18:05:06 +08:00
ziyue 4700ab77de Feature: 新增转协议超时等相关配置项( #1241) 2021-11-30 18:04:43 +08:00
xiongziliang 8b24088ab1 Refine: h264 rtp encoder不再过滤sei、aud帧 2021-11-28 21:15:03 +08:00
ziyue 3a99440296 Refine: 优化代码，减少拷贝 2021-11-23 15:59:18 +08:00
xiongziliang 97f7255f0a Performance: 使用循环池优化rtmp分发性能 2021-11-21 11:34:20 +08:00
xiongziliang 5404a5266a Performance: 使用循环池优化http-flv分发性能 2021-11-21 11:28:14 +08:00
ziyue 0b79de9d13 MediaSource: 禁止重复推送一个已经注册的流 2021-11-19 15:33:16 +08:00
ziyue afdc5e4267 Refine: 优化tcp/udp服务器异常管理断开机制 2021-11-19 15:26:33 +08:00
ziyue b13a0f5b79 Splitter: 全局限制内存使用量，防止内存溢出 2021-11-19 11:27:27 +08:00
ziyue 0281cb6a11 GB28181: 修复tcp推流时，流异常可能导致死循环的bug 2021-11-19 11:09:55 +08:00
xiongziliang a5fc3b04d3 Refine: 删除多余代码 2021-11-13 00:31:32 +08:00
xiongziliang b0343acf8c Refine: 提炼精简代码 2021-11-13 00:24:38 +08:00
ziyue 56b7a8a97b Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-11-10 15:30:57 +08:00
ziyue ac41a1e933 RtmpPlay: 兼容无metadata的rtmp流 2021-11-10 15:25:24 +08:00
Xiaofeng Wang 9aaf3ce2ff
优先使用静态 payload type 值 (#1206) 2021-11-10 14:45:37 +08:00
ziyue e51a78ebdc MediaSink: 确保收到数据后才触发TrackReady回调 2021-11-10 14:35:37 +08:00
ziyue 1513e9a857 Revert "忽略某些流声明存在却没实质数据的track" 
This reverts commit b42072405e.
 2021-11-10 14:18:55 +08:00
ziyue 6f92ef2f3b PlayerProxy: 减少一次MediaSink数据过滤，提高性能 2021-11-10 13:56:58 +08:00
ziyue b7e187d7af Player: 添加kWaitTrackReady选项决定播放器是否等待所有track ready再回调 2021-11-10 13:56:04 +08:00
ziyue e38f2253ff Demuxer: 解复用减少一次MediaSink的数据过滤 2021-11-10 13:44:29 +08:00
ziyue 2a8a6cac27 Refine: 优化MultiMediaSourceMuxer创建代码 2021-11-10 12:48:13 +08:00
ziyue b892ac346f MediaSink: 优化静音音频相关逻辑性能 2021-11-10 12:41:06 +08:00
ziyue 1ce841ce42 MediaSink: 修复静音音频添加逻辑bug 2021-11-10 12:04:32 +08:00
ziyue 817542cd0c Mutex: 删除一些不必要的互斥锁 2021-11-10 11:38:54 +08:00
ziyue 143979f354 Stamp: 兼容时间戳跳跃的情况 2021-11-10 11:38:54 +08:00
ziyue fdfde17ec7 Demuxer/Player: 修改解复用与播放器底层逻辑，确保触发播放成功回调时不丢帧 2021-11-10 11:38:54 +08:00
ziyue 37fdb8d135 MediaSource: 继承改成私有 2021-11-10 11:38:54 +08:00
ziyue ded5d83e04 MediaSink: 静音音频确保最后添加 2021-11-10 11:38:54 +08:00
ziyue dad0c5e3cc MediaPusher: 抽象精简代码 2021-11-09 17:49:18 +08:00