595182cebb
Revert "当调用mk_media_source_close(ptr, 1);时，主动注销流 ( #1401 )"
...
This reverts commit c97aa8483e
2022-02-09 14:21:35 +08:00
81747d114e
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
2022-02-09 11:48:51 +08:00
cd1ca2c18c
http-flv直播后缀由.flv改成.live.flv(目的是防止与flv文件下载冲突)
2022-02-09 11:48:15 +08:00
8c30f11c17
修复windows下编译错误
2022-02-05 21:32:56 +08:00
1dd3d6f1ac
忽略SIGPIPE信号
2022-02-05 20:39:24 +08:00
0402646f7c
防止命名空间歧义
2022-02-05 01:01:29 +08:00
4505f8ff4f
仅http协议开启sendfile优化
2022-02-05 01:00:48 +08:00
d13e31c21b
尝试使用sendfile优化http文件服务器 ( #1411 )
2022-02-04 23:02:19 +08:00
c72cf4cbcc
整理命名空间 ( #1409 )
...
* feat: remove using namespace mediakit in header files.
(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)
* feat: remove using namespace mediakit in FFmpegSource.h
* feat: remove using namespace mediakit in RtpExt.h
* feat: remove using namespace mediakit in header files.
* feat: remove using namespace std in header files.
* feat: remove using namespace std in header files when zltoolkit remove std in header
* 补充命名空间
* 整理命名空间
* 整理命名空间2
* 修复macos ci
* 修复编译问题
* 修复编译问题2
* 修复编译问题3
Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
2022-02-02 20:34:50 +08:00
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
3bf6ec8939
修复获取推流所有权导致引用计数紊乱的bug: #1397
2022-01-26 00:37:51 +08:00
756ec1364b
websocket客户端触发事件时确保对象强引用有效
...
同时修复websocket客户端判断alive返回false的bug
2022-01-25 11:44:51 +08:00
4f27894302
添加bom头
2022-01-24 14:25:37 +08:00
bc583e80b5
合并pr: #1391
2022-01-24 14:23:36 +08:00
96061f1d36
Merge branch 'fix_rtc_g711_play' of github.com:ZLMediaKit/ZLMediaKit
2022-01-24 14:16:19 +08:00
341459fbf5
fix non rtc push rtc play g711 audio loss
2022-01-24 11:57:24 +08:00
0ae9a8c8c8
Revert "添加递归溢出检测代码: #1363"
...
This reverts commit 8937d9ea92
2022-01-24 11:38:36 +08:00
80ecd2098e
修复编译警告
2022-01-24 10:48:15 +08:00
100822f079
HLS: 修复时间戳回退导致不生成ts切片的bug: #1381 , #1386
2022-01-21 18:00:44 +08:00
3a8e954255
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
2022-01-21 16:11:22 +08:00
5007578202
hls/ts 播放器不做content-length严格限制
2022-01-21 16:10:27 +08:00
f46d909bba
添加bom头，解决msvc编译问题
2022-01-20 22:49:47 +08:00
bf191aa902
去除多余头文件
2022-01-20 15:42:53 +08:00
88dc8d0a73
重写http客户端异常处理机制
2022-01-20 15:17:19 +08:00
0f905b7333
优化http-ts播放器日志提示
2022-01-19 22:53:21 +08:00
ee6ad66a6d
HTTP: 重写http相关超时管理机制
2022-01-19 22:50:44 +08:00
81cf93a2bf
openRtpServer接口强制关闭reuse_port属性，防止端口冲突
2022-01-19 17:44:58 +08:00
8937d9ea92
添加递归溢出检测代码: #1363
2022-01-17 14:47:55 +08:00
e8b0993493
给openrtpserver接口添加enable_reuse参数 ( #1372 )
...
* 修改rtpopen逻辑
* 给openrtpserver接口添加enable_reuse端口
2022-01-14 21:53:01 +08:00
a3e628449e
解决rtsp以MULTICAST方式拉流导致的奔溃问题 ( #1368 )
2022-01-14 13:14:30 +08:00
75465311d9
修复丢包导致aac确实导致内存越界的bug: #1363
2022-01-14 13:09:47 +08:00
d52fc4c31f
Refine: 优化rtsp相关代码
2022-01-12 15:24:28 +08:00
5b6ff0af27
完善mingw编译环境的适配
2022-01-11 14:09:57 +08:00
fdcc29e0ed
修复http客户端复用header无法更新的bug: #1349
2022-01-11 10:44:49 +08:00
60f11df1ea
Revert "修复302跳转时, 如果跨域,header不正确的问题 ( #1349 )"
...
This reverts commit 741b197f
2022-01-11 09:18:36 +08:00
412d280cd7
修复断连续推转协议失效的bug
2022-01-10 17:34:39 +08:00
1dabc22347
修正错误注释
2022-01-10 17:00:25 +08:00
f5efd232a9
rtsp/rtmp推流支持断连续推: #1240 , #1300
2022-01-10 16:43:57 +08:00
262af8dfeb
修复编译问题
2022-01-09 15:12:23 +08:00
7b04385bc8
合并http-ts播放器特性: #1336
2022-01-09 15:01:23 +08:00
a4c69e61cd
Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit
2022-01-09 14:54:21 +08:00
819599ac25
修复获取帧率逻辑 ( #1293 )
2022-01-09 14:50:54 +08:00
741b197f31
修复302跳转时, 如果跨域,header不正确的问题 ( #1349 )
2022-01-09 14:32:59 +08:00
f4d8eb4515
Rtmp: 获取h264sps/aac config失败时打印rtmp包内容
2022-01-08 16:28:13 +08:00
6e445614b4
申请udp端口使用全局互斥锁保护，防止端口重复分配
2022-01-08 16:07:08 +08:00
fd6e4b6342
MPEG: 优化http-ts性能: #1342
2022-01-06 15:30:09 +08:00
5a592e6db6
优化循环池性能
2022-01-06 14:30:44 +08:00
3a0857ea31
当url并不是m3u8文件时, 避免拉取hls流出错 ( #1341 )
2022-01-05 20:01:19 +08:00
ed4291bf3d
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
2022-01-04 16:54:51 +08:00
3ccd48e7a9
HLS: 返回全部切片数据后，链接断开不报错: #1332
2022-01-04 16:53:19 +08:00
ziyue
xiongziliang
joshuafc
xgj
wangcker
JayChen0519
Dw9
alexliyu7352