amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 20:47:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,738 Commits 16 Branches 0 Tags 225 MiB
f05a9501fa
Commit Graph

189 Commits

Author SHA1 Message Date
ziyue
8769ea83a9 修复关闭hls相关功能时编译报错问题 2021-10-16 16:56:59 +08:00
xiongziliang
b1666eb651 实现媒体源pause/speed接口:#1129 2021-09-29 00:16:56 +08:00
ziyue
e9008afca0 addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
ziyue
4dbe0a1d3e 合并pr：#1025 2021-08-12 20:37:46 +08:00
baiyfcu
0ed902509a player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件 2021-08-09 18:28:43 +08:00
wxf
e03d15053d 调整结构, 清理关系, 取消继承 MP4FileDisk, 改为成员 
Fix #1018
 2021-08-03 21:48:19 +08:00
ziyue
0e27704859 修复编译问题 2021-07-22 14:59:23 +08:00
ziyue
4b694ccde8 http-ts直播减少一次内存拷贝 2021-07-07 16:17:56 +08:00
ziyue
039be5444e 修复m3u8中extinf不准的问题：#816 2021-07-07 11:53:01 +08:00
ziyue
03addaf0b7 由于frame merge时已经过滤无效帧，所以移除多余代码 2021-07-07 11:37:22 +08:00
xiongziliang
9f9b3a5a64 提高http-ts直播性能：#961 2021-07-06 23:57:39 +08:00
ziyue
e8c9666af0 支持hls直播文件延时删除: #913 2021-06-23 10:30:58 +08:00
xia-chu
af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xiongziliang
be8403c31c 完善代码 2021-03-14 10:29:17 +08:00
xiongziliang
c0f4899950 录制接口支持指定切片时间大小:#747 2021-03-07 10:41:57 +08:00
xiongziliang
5b4fe604cb 修复编译警告 2021-03-07 10:05:23 +08:00
xia-chu
62ba87dd0f 优化frame性能及整理代码 2021-02-06 20:10:33 +08:00
xia-chu
827158af73 防止未开启录制功能时，使用该功能导致的bug 2021-02-06 20:10:31 +08:00
xia-chu
2b3ce0ec63 流量统计事件确保0字节时也能触发 2021-02-06 20:10:31 +08:00
xiongziliang
5d752c89b5 修复编译问题 2021-01-17 20:15:08 +08:00
xia-chu
b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
3f37ef618d 删除文件太小的录像 2020-12-05 12:25:52 +08:00
xiongziliang
55cf411c1e 支持bitrate 2020-12-05 12:22:17 +08:00
xiongziliang
c512c1a02e 关闭vhost时，m3u8中ts文件不指定vhost：#560 2020-11-21 21:54:12 +08:00
xiongziliang
bb9b39d821 添加按需转协议开关，默认一直转协议：#569 2020-11-15 00:40:46 +08:00
xiongziliang
700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
xiongziliang
38a002646d 修复FFmpeg拉流代理功能缺陷的问题：#533 2020-10-24 23:31:58 +08:00
xiongziliang
51fcaeda4c 更新第三方库 2020-10-18 21:33:36 +08:00
xiongziliang
cd27e5a9f9 注意！hls mp4录制的customized path字段改成录制根目录 相当于配置文件中hls mp4录制根目录相关设置 2020-10-01 14:55:34 +08:00
xiongziliang
eccb1a664c Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit 2020-10-01 13:39:19 +08:00
xiongziliang
7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
qiuzhouwei
4132df89cd 增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等 2020-09-28 10:45:59 +08:00
xiongziliang
5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang
efdc105b40 减少内存拷贝，提升性能 2020-09-21 14:56:58 +08:00
xiongziliang
416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang
d971eccf92 新增支持HTTP-fMP4 WebSocket-fMP4直播 2020-09-20 19:45:37 +08:00
xiongziliang
4ce1a25f09 修复MP4解复用时不写入adts头的问题 2020-09-20 19:45:21 +08:00
xiongziliang
071d0a9fd1 提炼MP4相关接口和代码 2020-09-20 19:45:04 +08:00
xiongziliang
2dd1046131 合并fmp4和mov接口 2020-09-20 19:44:20 +08:00
xiongziliang
f84981dc75 合并pr(添加录制ts完成通知): #479 2020-09-20 11:40:42 +08:00
xiongziliang
0fce108de5 Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr 2020-09-20 11:01:45 +08:00
xiongziliang
5104252474 修复HLS直播结束后，最后一个切片无法写入的问题 2020-09-20 10:56:54 +08:00
wxf
748bb8e488 统一 mp4 及 ts 录像信息定义 2020-09-15 19:09:26 +08:00
wxf
b22a6e3dbd 添加 ts 切片是否通知选项, 默认为不通知 2020-09-15 17:46:12 +08:00
wxf
188e087fc2 添加 hls ts 切片录制完成通知 2020-09-14 13:20:45 +08:00
wxf
a024c51536 修正警告: moving a local object in a return statement prevents copy elision 
https://www.viva64.com/en/w/v828/

编译器会对返回本地变量优化([Named] Return Value Optimization (RVO/NRVO)),
无论是 C++11 之前还是之后, 添加 move 后反而会影响该优化.

C++ Core Guidelines F.48: Do not return std::move(local)
 2020-09-13 11:07:19 +08:00
xiongziliang
9b305bd4ae 优化HLS播放个数统计 2020-09-12 21:27:34 +08:00
xiongziliang
d26b751273 修复hls播放器流量统计不准确的bug 2020-09-12 20:52:53 +08:00
xiongziliang
1e1b3794da HLS切片间隔以数据时间戳为准:#463 2020-09-12 20:49:00 +08:00
xiongziliang
1b9550cfc4 修复HLS按需生成相关bug 2020-09-12 20:42:58 +08:00
xiongziliang
3b5053af50 修复关闭HLS后，编译失败的问题 2020-09-12 19:46:58 +08:00
xiongziliang
be1e872f0c 完善按需转协议(包括hls) 2020-09-12 19:20:18 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
xiongziliang
51ae8d4083 复用忽略协议查找流的相关代码 2020-09-06 18:19:54 +08:00
xiongziliang
9fa2221a79 整理代码 2020-09-06 17:51:00 +08:00
xiongziliang
29fcf3eb3b 完善代码 2020-08-30 09:15:02 +08:00
xiongziliang
aedb1a8866 修复hls无人观看事件不触发的bug 2020-08-30 09:14:45 +08:00
xiongziliang
4255914613 ts打包过滤没有adts头的aac：#453 2020-08-23 17:57:30 +08:00
xiongziliang
f23e117751 MultiMediaSourceMuxer默认能处理大部分事件 2020-08-08 12:20:13 +08:00
xiongziliang
a9b0ca9cdd hls支持opus 2020-08-01 20:56:34 +08:00
xiongziliang
a22f97c777 rtsp/rtmp/mp4支持opus并整理代码 2020-08-01 10:22:12 +08:00
xiongziliang
c31b0cc26b H264Track不过滤SEI: #411 2020-07-16 16:26:13 +08:00
xiongziliang
bdb28c53de 重命名前确保关闭mp4文件:#416 2020-07-16 10:40:30 +08:00
xiongziliang
0e47dc94f9 aac config不再限制两个字节：#336 2020-06-11 17:19:10 +08:00
xiongziliang
7df092074d 修复m3u8起始阶段SEQUENCE错误的bug:#288 2020-06-09 14:21:57 +08:00
xiongziliang
ff7914e441 修改MediaSource相关接口 2020-05-26 10:11:58 +08:00
xiongziliang
477475a60f 批量添加bom头、批量替换tab字符 2020-05-18 15:31:49 +08:00
xiongziliang
1970f6014e 优化音视频同步 2020-05-15 18:08:54 +08:00
xiongziliang
d27a8117e1 mp4录制支持opus 2020-05-12 11:48:15 +08:00
xiongziliang
0eb97d5471 修复不能控制录制路径的问题：#279 2020-04-28 09:40:47 +08:00
xiongziliang
2c9141513d ts/ps支持G711 2020-04-26 09:45:00 +08:00
xiongziliang
b4228f91c3 适配ZLToolKit 2020-04-24 12:39:22 +08:00
xiongziliang
eda7a59f3c 统一事件参数类型 2020-04-23 22:04:59 +08:00
xiongziliang
2e3cee09bb hls/mp4录像/mp4点播/ts解析/ps解析初步支持G711 2020-04-23 15:19:20 +08:00
xiongziliang
d363871601 修复一些mp4点播不支持的问题 2020-04-13 09:44:05 +08:00
xiongziliang
e5d5cabf89 部分恢复录制相关接口 2020-04-05 09:26:29 +08:00
xiongziliang
070c2c46d7 完善代码 2020-04-04 23:13:10 +08:00
xiongziliang
7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang
67f4ca4b83 修复mp4循环点播逻辑不生效的bug 2020-04-04 16:08:31 +08:00
xiongziliang
cefb2a7cc4 hls/mp4录制不再能随时开启或关闭 2020-04-04 14:33:12 +08:00
xiongziliang
6e5cd0345d 优化点播相关代码 2020-04-03 23:27:16 +08:00
xiongziliang
1ca81e39fe 提高H264点播兼容性 2020-04-03 23:03:47 +08:00
xiongziliang
c3c4c72d1d 去除mp4v2依赖 2020-04-03 22:28:27 +08:00
xiongziliang
0a31b03064 完善MP4点播 2020-04-03 22:08:03 +08:00
xiongziliang
47d8e37e3d 完善mp4点播 2020-04-03 22:04:13 +08:00
xiongziliang
278591d5ee 修复MP4点播相关bug 2020-04-03 21:39:44 +08:00
xiongziliang
095834fe57 重写MP4点播 2020-04-03 20:46:55 +08:00
xiongziliang
46be8a38e7 重写MP4点播 2020-04-03 20:45:58 +08:00
xiongziliang
ace200716a 修复无人播放事件触发延时不准确的bug 2020-03-23 10:21:17 +08:00
xiongziliang
1168174c2b tab统一替换为4个空格键：#242 2020-03-20 11:51:24 +08:00
xiongziliang
10884340b0 优化rtp推流相关代码 2020-03-08 21:19:20 +08:00
xiongziliang
069bde09c1 支持ts rtp流 2020-03-06 13:00:06 +08:00
xiongziliang
d60101b93c 优化单Track情况下等待3秒的情况 2020-02-25 14:59:40 +08:00
xiongziliang
a7a376b3f2 流量汇报事件添加id参数 2020-02-13 12:10:08 +08:00
xiongziliang
7e25537957 流量汇报事件添加客户端ip和端口参数 2020-02-13 11:33:59 +08:00
xiongziliang
51e0c71007 添加更多录制相关方法 2020-02-01 22:58:58 +08:00
xiongziliang
e8ba94ba09 还原代码 2020-02-01 22:58:21 +08:00
xiongziliang
075a615a92 Merge branch 'research' of https://gitee.com/liuziloong/FreeNVR 2020-02-01 21:20:57 +08:00
xiongziliang
a9539eb626 HLS遇到I帧才切片:#226 2020-01-24 22:00:55 +08:00
xiongziliang
224a35dbd5 解决单音频无法录制mp4的bug 2020-01-24 21:09:47 +08:00