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

1749 Commits

Author SHA1 Message Date
joshuafc c97aa8483e
当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401) 
* 当调用mk_media_source_close(ptr, 1);时，主动注销流

主动调用上述函数时，期望不再等待RtmpSession.cpp:49处getPoller()->doDelayTask(continue_push_ms, [push_src]() { return 0; });捕获的指针，等待析构时反注册，而是立即反注册。

* `MediaSource::close`逻辑执行成功后执行`unregist`
 2022-01-27 14:56:18 +08:00
xiongziliang 3bf6ec8939 修复获取推流所有权导致引用计数紊乱的bug: #1397 2022-01-26 00:37:51 +08:00
ziyue 756ec1364b websocket客户端触发事件时确保对象强引用有效 
同时修复websocket客户端判断alive返回false的bug
 2022-01-25 11:44:51 +08:00
ziyue 4f27894302 添加bom头 2022-01-24 14:25:37 +08:00
ziyue bc583e80b5 合并pr: #1391 2022-01-24 14:23:36 +08:00
ziyue 96061f1d36 Merge branch 'fix_rtc_g711_play' of github.com:ZLMediaKit/ZLMediaKit 2022-01-24 14:16:19 +08:00
xgj 341459fbf5 fix non rtc push rtc play g711 audio loss 2022-01-24 11:57:24 +08:00
ziyue 0ae9a8c8c8 Revert "添加递归溢出检测代码: #1363" 
This reverts commit 8937d9ea92.
 2022-01-24 11:38:36 +08:00
ziyue 80ecd2098e 修复编译警告 2022-01-24 10:48:15 +08:00
ziyue 100822f079 HLS: 修复时间戳回退导致不生成ts切片的bug: #1381, #1386 2022-01-21 18:00:44 +08:00
ziyue 3a8e954255 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-21 16:11:22 +08:00
ziyue 5007578202 hls/ts 播放器不做content-length严格限制 2022-01-21 16:10:27 +08:00
xiongziliang f46d909bba 添加bom头，解决msvc编译问题 2022-01-20 22:49:47 +08:00
ziyue bf191aa902 去除多余头文件 2022-01-20 15:42:53 +08:00
ziyue 88dc8d0a73 重写http客户端异常处理机制 2022-01-20 15:17:19 +08:00
ziyue 0f905b7333 优化http-ts播放器日志提示 2022-01-19 22:53:21 +08:00
ziyue ee6ad66a6d HTTP: 重写http相关超时管理机制 2022-01-19 22:50:44 +08:00
ziyue 81cf93a2bf openRtpServer接口强制关闭reuse_port属性，防止端口冲突 2022-01-19 17:44:58 +08:00
ziyue 8937d9ea92 添加递归溢出检测代码: #1363 2022-01-17 14:47:55 +08:00
wangcker e8b0993493
给openrtpserver接口添加enable_reuse参数 (#1372) 
* 修改rtpopen逻辑

* 给openrtpserver接口添加enable_reuse端口
 2022-01-14 21:53:01 +08:00
JayChen0519 a3e628449e
解决rtsp以MULTICAST方式拉流导致的奔溃问题 (#1368) 2022-01-14 13:14:30 +08:00
ziyue 75465311d9 修复丢包导致aac确实导致内存越界的bug: #1363 2022-01-14 13:09:47 +08:00
ziyue d52fc4c31f Refine: 优化rtsp相关代码 2022-01-12 15:24:28 +08:00
ziyue 5b6ff0af27 完善mingw编译环境的适配 2022-01-11 14:09:57 +08:00
ziyue fdcc29e0ed 修复http客户端复用header无法更新的bug: #1349 2022-01-11 10:44:49 +08:00
xiongziliang 60f11df1ea Revert "修复302跳转时, 如果跨域,header不正确的问题 (#1349)" 
This reverts commit 741b197f
 2022-01-11 09:18:36 +08:00
ziyue 412d280cd7 修复断连续推转协议失效的bug 2022-01-10 17:34:39 +08:00
ziyue 1dabc22347 修正错误注释 2022-01-10 17:00:25 +08:00
ziyue f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
xiongziliang 262af8dfeb 修复编译问题 2022-01-09 15:12:23 +08:00
xiongziliang 7b04385bc8 合并http-ts播放器特性: #1336 2022-01-09 15:01:23 +08:00
xiongziliang a4c69e61cd Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit 2022-01-09 14:54:21 +08:00
Dw9 819599ac25
修复获取帧率逻辑 (#1293) 2022-01-09 14:50:54 +08:00
alexliyu7352 741b197f31
修复302跳转时, 如果跨域,header不正确的问题 (#1349) 2022-01-09 14:32:59 +08:00
xiongziliang f4d8eb4515 Rtmp: 获取h264sps/aac config失败时打印rtmp包内容 2022-01-08 16:28:13 +08:00
xiongziliang 6e445614b4 申请udp端口使用全局互斥锁保护，防止端口重复分配 2022-01-08 16:07:08 +08:00
ziyue fd6e4b6342 MPEG: 优化http-ts性能: #1342 2022-01-06 15:30:09 +08:00
ziyue 5a592e6db6 优化循环池性能 2022-01-06 14:30:44 +08:00
alexliyu7352 3a0857ea31
当url并不是m3u8文件时, 避免拉取hls流出错 (#1341) 2022-01-05 20:01:19 +08:00
ziyue ed4291bf3d Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-04 16:54:51 +08:00
ziyue 3ccd48e7a9 HLS: 返回全部切片数据后，链接断开不报错: #1332 2022-01-04 16:53:19 +08:00
alexliyu7352 6f9f93cb97
忘记删除很早很早以前注释掉的代码了 2022-01-04 15:46:48 +08:00
Alex 4792f6213b 新增Ts拉流 2022-01-04 15:32:59 +08:00
alexliyu7352 a441168004
修正不使用resetWhenReplay选项时, MediaSource会重复注册的问题 (#1330) 2022-01-04 14:47:41 +08:00
ziyue 389dd5f54b MPEG: 优化ts/ps muxer内存malloc和拷贝性能 2021-12-31 11:01:56 +08:00
ziyue c0afcc48e5 malloc大内存警告环境变量改名为MEM_WARN_SIZE 2021-12-31 10:26:36 +08:00
xiongziliang 9cf6fea03e 修复编译问题 2021-12-30 22:12:36 +08:00
ziyue 84f3aa0748 完善内存统计并在malloc大内存时打印backtrace 2021-12-30 20:34:56 +08:00
ziyue 7f6be9e118 Refine: 消除编译警告 2021-12-30 15:28:27 +08:00
ziyue 940fe333db 尝试解决全局malloc统计相关变量提前销毁的bug 2021-12-30 15:28:27 +08:00
ziyue 1a6a62a304 malloc确保内存对齐 2021-12-29 20:57:35 +08:00
夏楚 15297a3ca3
添加内存malloc次数分布统计 (#1322) 2021-12-29 20:48:15 +08:00
ziyue 098ecf542a 部分代码移至第三方库 2021-12-29 14:18:52 +08:00
ziyue 5ae5c66256 Typo: 修复拼写错误 2021-12-28 21:29:00 +08:00
ziyue 89870190e9 MPEG: 整合复用ts/ps生成代码 2021-12-28 21:21:01 +08:00
ziyue dce6b27f4f Http-FLV: http-flv直播采用绝对时间戳并支持las 2021-12-28 21:21:01 +08:00
ziyue 30b63ad656 Rtmp: rtmp分发改成绝对时间戳 2021-12-28 21:21:01 +08:00
ziyue b749cfb8a3 TS: hls/http-ts 改为绝对时间戳 2021-12-28 21:21:01 +08:00
夏楚 878ce87329
支持线程内存malloc统计 (#1317) 2021-12-27 17:40:15 +08:00
xiongziliang 7f649b94e5 Rtmp: 修复openssl未开启导致链接失败的问题: #1301 2021-12-26 19:58:30 +08:00
xiongziliang 98d435ef50 Rtmp: 修复openssl未开启导致编译失败的问题: #1301 2021-12-26 18:34:55 +08:00
ziyue 3d44c772ac HLS: hls播放器解析ts失败时，清空数据以便恢复播放 2021-12-24 19:58:27 +08:00
ziyue b1f68b9563 Splitter公开一些方法 2021-12-24 19:57:03 +08:00
ziyue 3cba8fca79 分包器缓存太多时主动清空数据 2021-12-24 17:47:15 +08:00
ziyue 5832de7ed8 HLS: ts分包器主动丢弃非法数据 2021-12-24 14:25:01 +08:00
ziyue c25ff6400f HLS: hls播放解决播放下一个切片导致数据丢失的bug： #1294 2021-12-24 13:29:16 +08:00
ziyue 0bf75529a2 HTTP: 确保http请求结束后不再触发超时事件 2021-12-24 13:26:42 +08:00
ziyue f89abfaf67 HTTP: 优化http客户端代码，并修复重定向时超时的bug: #1306 2021-12-24 11:25:55 +08:00
ziyue 4e01c29833 Rtmp: 优化复杂握手c0c1生成算法性能 2021-12-22 22:20:28 +08:00
ziyue ab14585a81 Rtmp: rtmp客户端支持复杂握手，兼容某些rtmp服务器 2021-12-22 22:06:19 +08:00
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