Commit Graph

42 Commits

Author SHA1 Message Date
jamesZHANG500 03c93d0b23
Add config for save fmp4 record files (#3356) 2024-03-10 16:19:02 +08:00
xia-chu c0bb7db476 BugFix: crash when FrameMerger::flush
In a lambda expression, temporary stack variables should not be captured; otherwise,
the variables may have become invalid when FrameMerger::flush is called.
2023-12-14 17:28:21 +08:00
夏楚 64f15202de
Support multi audio/video track 2023-12-09 22:34:22 +08:00
夏楚 bbe8f4a018
release 8.0 2023-12-09 16:23:51 +08:00
fruit Juice 1609fe67d7
Track新增update方法,支持更新宽高采样率等信息 (#2960)
当变分辨率时候,实时更新MP4封装层的参数信息,避免出现封装层与编码(SPS)层视频宽高不一样,造成解码参数错误花屏;同时也支持更新音频采样率等信息。


---------

Co-authored-by: xia-chu <771730766@qq.com>
2023-11-07 23:36:41 +08:00
xia-chu 3e9a8b9d8b 优化函数命名
isCfgFrame -> isConfigFrame
getAacCfg -> getConfig
2023-07-22 19:46:26 +08:00
XiaoYan Lin cb0579a16d
新增支持hls-fmp4直播(#2603 #977 #1965)
同时主要优化点包括:
1、编译宏特性开关优化。
2、转协议复用器相关创建代码移动至Recorder类。
3、转协议复用器onAllTrackReady函数修改为addTrackCompleted。
4、startRecord/stopRecord/isRecording接口新增支持ts/fmp4/hls-fmp4协议。

Co-authored-by: xia-chu <771730766@qq.com>
Co-authored-by: linxiaoyan87 <linxiaoyan87@foxmail.com>
2023-07-02 12:02:33 +08:00
xiongguangjie 30182701f5 fix vlc can't play mp4 of jpeg #2388 2023-04-19 19:40:58 +08:00
Alexandr afa6465178 Changes to MP4Muxer for CodecJPEG 2022-12-30 08:56:57 +03:00
mtdxc 754073918a
Header refactor (#2115)
* 优化MultiMediaSourceMuxer头文件包含

* 将MediaSinkDelegate和Demux移到MediaSink中

* MediaSource头文件重构, 独立出PacketCache.h
精简Frame和Track的头文件

* Rtmp头文件重构

* Rtsp头文件重构

* webrtc头文件重构

* 规范.h头文件包含,并将其移到.cpp中:
- 尽量不包含Common\config.h
- Util\File.h
- Rtsp/RtspPlayer.h
- Rtmp/RtmpPlayer.h

* 删除多余的Stamp.h和Base64包含
2022-11-29 11:07:13 +08:00
xiongziliang 946945ce7b 优化代码
整理代码
2022-11-12 22:06:09 +08:00
ziyue ac1abb34da 新增媒体流flush机制:#1996 2022-10-16 19:54:17 +08:00
ziyue 80eef693c6 精确mp4录制时长:#1795 2022-10-16 16:44:54 +08:00
ziyue 35791aac89 优化代码,去除编译警告,修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue 9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +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
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 e9008afca0 addTrack/inputFrame接口支持返回值;新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
ziyue 03addaf0b7 由于frame merge时已经过滤无效帧,所以移除多余代码 2021-07-07 11:37:22 +08:00
xia-chu af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu b6cbc87712 全面整理代码,去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang 700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
xiongziliang d971eccf92 新增支持HTTP-fMP4 WebSocket-fMP4直播 2020-09-20 19:45:37 +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 29fcf3eb3b 完善代码 2020-08-30 09:15:02 +08:00
xiongziliang c31b0cc26b H264Track不过滤SEI: #411 2020-07-16 16:26:13 +08:00
xiongziliang 0e47dc94f9 aac config不再限制两个字节:#336 2020-06-11 17:19:10 +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 2e3cee09bb hls/mp4录像/mp4点播/ts解析/ps解析初步支持G711 2020-04-23 15:19:20 +08:00
xiongziliang 7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang 46be8a38e7 重写MP4点播 2020-04-03 20:45:58 +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 224a35dbd5 解决单音频无法录制mp4的bug 2020-01-24 21:09:47 +08:00
xiongziliang cdba214e79 MP4录制修复兼容性问题 2020-01-03 14:27:26 +08:00
xiongziliang f32f5df4eb 修复mp4录制崩溃的bug:#181 2019-12-18 18:40:41 +08:00
xiongziliang 73df1bb949 添加安全冗余代码 2019-12-18 15:02:55 +08:00
xiongziliang ee66d945e8 更新media-server库 2019-12-12 22:25:55 +08:00
xiongziliang de33d6a847 整理文件录制 2019-12-04 10:45:38 +08:00