amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-01 17:11:31 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,506 Commits 16 Branches 0 Tags 224 MiB
40099df3c0
Commit Graph

3506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongguangjie
9c45fca761
根据配置禁用mmap缓存 (#1429) 2022-02-17 10:35:10 +08:00
mtdxc
af08b58d29
cmake项目分组 (#1431) 
重要项目(toolkit和mediakit)增加目录显示
 2022-02-17 10:33:42 +08:00
ziyue
304c898a3a 完善http文件获取相关代码 2022-02-16 16:58:13 +08:00
ziyue
81199fabd4 添加必要头文件：#1248 2022-02-16 10:31:39 +08:00
xiongziliang
45d9bcd5f4 ts解析失败时清空split缓存 2022-02-13 22:02:16 +08:00
xiongziliang
6876a0a3e9 更新第三方库，解决时间戳回环导致ts无pat/pmt的bug 2022-02-13 21:55:09 +08:00
xiongziliang
2e9d77e8e1 删除多余ts split代码 2022-02-13 21:53:21 +08:00
xiongziliang
83c1f29253 HLS: 解决hls断流重新生成后异常的bug 2022-02-13 21:06:32 +08:00
夏楚
e37982adee
优化hls媒体流注册与无人观看清理机制 (#1421) 
* 优化hls媒体流注册与无人观看清理机制

* 优化hls cookie管理

* bug fixed
 2022-02-12 16:24:55 +08:00
xiongziliang
2fbd8de727 更新zltoolkit,解决msvc2017编译问题 2022-02-11 20:44:42 +08:00
夏楚
d432888ad4
Merge pull request #1419 from ZLMediaKit/feature/mmap 
通过共享mmap方式提高http文件/hls服务器性能
 2022-02-11 16:56:08 +08:00
ziyue
a2b6344861 修复hls m3u8返回content-type异常的问题 2022-02-11 16:36:40 +08:00
ziyue
49fc17d7e0 hls m3u8文件直接通过内存读写 2022-02-11 16:21:19 +08:00
ziyue
642c9c075a 修复设置cookie错误的bug 2022-02-11 15:14:34 +08:00
ziyue
36f24527a4 http cookie减少互斥锁，优化性能 2022-02-11 14:33:11 +08:00
ziyue
c510f3765a 关闭小文件mmap预加载功能 2022-02-11 14:02:55 +08:00
ziyue
984715a018 修复获取共享mmap大小bug 2022-02-11 13:40:41 +08:00
ziyue
8188aa0d53 非必要不调用fopen 2022-02-11 13:10:56 +08:00
ziyue
3f6f26731a ts小文件先加载到内存 2022-02-11 12:49:03 +08:00
ziyue
96503967fc 屏蔽sendfile特性 2022-02-11 12:03:45 +08:00
ziyue
832c8d0d80 优化mktime性能问题 2022-02-11 11:54:12 +08:00
ziyue
d541ed2572 修复编译警告 2022-02-11 11:13:43 +08:00
ziyue
8338773767 hls/http-ts播放器新增性能测试模式 2022-02-11 11:11:30 +08:00
ziyue
91c0a563c3 确保mmap缓存记录表不膨胀 2022-02-10 21:23:50 +08:00
ziyue
dc672b14e3 确保32位系统支持超过4GB文件下载 2022-02-10 21:06:51 +08:00
ziyue
ba213346bc http文件服务器mmap方案采用共享方式 2022-02-10 20:57:23 +08:00
ziyue
72caa43c97 主动关闭的流不支持断流续推: #1401 2022-02-09 14:31:40 +08:00
ziyue
595182cebb Revert "当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401)" 
This reverts commit c97aa8483e.
 2022-02-09 14:21:35 +08:00
ziyue
81747d114e Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-02-09 11:48:51 +08:00
ziyue
cd1ca2c18c http-flv直播后缀由.flv改成.live.flv(目的是防止与flv文件下载冲突) 2022-02-09 11:48:15 +08:00
xiongziliang
8c30f11c17 修复windows下编译错误 2022-02-05 21:32:56 +08:00
xiongziliang
1dd3d6f1ac 忽略SIGPIPE信号 2022-02-05 20:39:24 +08:00
xiongziliang
0402646f7c 防止命名空间歧义 2022-02-05 01:01:29 +08:00
xiongziliang
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
Dw9
80a0e27d8c
link atomic library automatic when compile on raspberrypi (#1405) 
* 增加检测atomic源文件

* 支持树莓派编译，自动检测atomic链接库

* 精简cmake操作
 2022-01-29 22:40:08 +08:00
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
Xiaofeng Wang
4b2be8e05a
调整 clang-format 风格配置 (#1404) 2022-01-27 14:39:55 +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
131476d3ac 更新zltoolkit, 修复RingBuffer相关bug 2022-01-24 10:47:21 +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