Commit Graph

34 Commits

Author SHA1 Message Date
zhangchuanfeng fdba1614fc 国标推流一直打印 'Already existed a same track' 2024-07-12 14:57:17 +08:00
zhang2349 6c3d362b5a
修正finish是true但track不支持,没有执行addTrackCompleted的问题 (#3689)
加快track类型不支持时媒体的注册速度
2024-07-05 20:55:36 +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
waken 9933398614
修复一个关闭GB28181时引发的崩溃问题 (#3118)
fix #3116 #3115
2023-12-13 17:41:57 +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
Aven af554bc376
update media-server (#2075)
* fix c2065 and c2051 error on windows, and the head file mpeg-ts-proto.h is also deprecated

* update media-server to 357ef88
2022-11-09 17:44:38 +08:00
ziyue ac1abb34da 新增媒体流flush机制:#1996 2022-10-16 19:54:17 +08:00
ziyue 9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
ziyue afcf247464 完善mpegts/ps容器对aac音频的兼容: #1801 2022-07-29 18:05:16 +08:00
CharleyWangHZ 28350c0d05
Optimize Decoder inheritance relationship (#1760) 2022-06-29 11:01:16 +08:00
xiongziliang 30dbac2c70 提高对不规范GB28181流的兼容性,防止视频轨道被忽略 2022-05-20 21:52:53 +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
wxf 2f82c89278 忽略海康 PS 流中的 0xBD 包 2021-07-18 17:31:27 +08:00
ziyue fadef1cac3 完善添加track日志打印 2021-06-16 11:39:46 +08:00
ziyue 14d70426ed 加快GB28181推流时注册速度 2021-06-16 10:26:17 +08:00
xia-chu af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu b7f4eae2bc 修复bug 2021-02-09 14:01:10 +08:00
xia-chu d6fc56d950 时间戳异常时,确保合并帧逻辑正常:#724 2021-02-06 20:10:32 +08:00
xia-chu b6cbc87712 全面整理代码,去除编译警告 2021-01-17 18:31:50 +08:00
monktan 3ddc14d35d 合并pr(#661): 减少unsport code打印,新增git信息获取
(cherry picked from commit 47f2f5b349)
2021-01-02 22:02:23 +08:00
mirs 6c853008fc fix disable hls and rtpproxy compile error 2020-12-18 18:32:12 +08:00
xiongziliang a64ce68592 解决单Track时,等待时间太长的问题 2020-11-29 09:38:04 +08:00
xiongziliang 700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
xiongziliang efdc105b40 减少内存拷贝,提升性能 2020-09-21 14:56:58 +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 bbcb4d41f7 修复ps解析误判为aac的bug 2020-06-29 11:55:13 +08:00
xiongziliang 5f50441f43 降低第三方库头文件依赖性 2020-06-12 18:17:49 +08:00
xiongziliang 7b90daab24 修复h264/h265 prefixSize计算错误的bug 2020-05-26 17:00:51 +08:00
xiongziliang 3c1e0531de 修复循环引用的问题 2020-05-21 11:44:57 +08:00
xiongziliang 198f223d63 进一步抽象ts/ps解析代码 2020-05-17 18:00:23 +08:00
xiongziliang 7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang 069bde09c1 支持ts rtp流 2020-03-06 13:00:06 +08:00