Commit Graph

543 Commits

Author SHA1 Message Date
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
ziyue 68948288e0 TcpSession/UdpSession统一为Session类 2022-11-19 09:33:10 +08:00
ziyue 034e29b25a 修复rtsp basic鉴权相关bug: #2087 2022-11-15 20:52:27 +08:00
xiongziliang 9bb6a2f828 全面整理转协议相关配置文件 2022-11-12 23:56:28 +08:00
xiongziliang 946945ce7b 优化代码
整理代码
2022-11-12 22:06:09 +08:00
ziyue 520945c2e9 提高线程安全性 2022-11-01 10:53:38 +08:00
ziyue ac1abb34da 新增媒体流flush机制:#1996 2022-10-16 19:54:17 +08:00
xiongguangjie bfebcd62c7 rtp packet sort set init seq 2022-09-28 15:29:11 +08:00
ziyue 15affeff1d 优化关闭媒体源相关逻辑: #1963 2022-09-18 20:36:47 +08:00
custompal 08789454c3
rtsp支持指定播放单一track (#1937) 2022-09-13 16:27:00 +08:00
cqm 999e0b274e 简化代码:
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
2022-09-07 11:47:15 +08:00
xiongziliang 06c6654ed5 精简代码 2022-09-03 16:32:10 +08:00
custompal 0d6509ce03 统一部分变量名和代码样式风格 2022-08-30 21:24:25 +08:00
custompal 04aa3ef41f 增加获取媒体流播放器列表功能 2022-08-30 21:05:19 +08:00
xiongzilaing 679c79802f 整理媒体事件相关代码,删除无须重载时的多余代码逻辑 2022-08-28 17:25:56 +08:00
ziyue 9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
ziyue 316301e910 确保rtsp直接拉流代理支持GOP缓存: #1843 2022-08-01 11:35:38 +08:00
xiongguangjie b53ad2cc2d for rtsp sdp pt more check 2022-07-17 00:30:12 +08:00
xiongguangjie 3eaf7897a7 rtsp player trust sdp pt ,ingore other pt compatible hik nvr record 2022-07-17 00:26:07 +08:00
xiongziliang 121b78e5dd 推流器主动断开时,避免开启断流续推功能 2022-07-02 15:36:44 +08:00
xiongziliang 7a24a22661 完善推流判断逻辑 2022-07-02 13:13:16 +08:00
xiongguangjie 266aaf9e0b fix rtsp and rtmp on_flow_report player or pusher judge error 2022-06-24 09:06:46 +08:00
xiongziliang d72af3e61a 兼容不规范的rtsp url: #904 2022-06-18 21:19:26 +08:00
xiongziliang 97116e1208 完善getOwnerPoller相关逻辑 2022-06-11 13:08:58 +08:00
xiongziliang b23cbaa0f8 on_publish hook新增continue_push_ms参数,用于断连续推延时控制 2022-06-04 11:06:35 +08:00
xiongziliang fd4145a622 完善对rtp负载为空处理逻辑:#1661 2022-05-28 10:34:54 +08:00
cqm 3110284302 修复rtc单独播放音频延时高问题 2022-05-27 09:39:03 +08:00
xiongziliang 251fe1f77c 优化随机端口分配逻辑 2022-05-14 23:34:33 +08:00
xiongziliang 8231c5c293 新增GB28181 tcp passive被动发送接口(startSendRtpPassive) 2022-05-14 23:25:22 +08:00
ziyue a44334acaf 全面支持ipv6 2022-05-08 16:33:33 +08:00
xiongziliang d66845425c 完善ipv6网络适配 2022-05-08 00:26:01 +08:00
ziyue 3062ea0e7c 初步支持ipv6: #576, #1406 2022-05-07 20:06:08 +08:00
xiongziliang 974055fd17 确保推流器主动断开时,不开启断连续推特性: #1559 2022-04-16 21:37:07 +08:00
xiongziliang a6e82799f5 openRtpServer接口新增re_use_port参数 2022-04-09 10:26:15 +08:00
Dw9 822a401f30
优化端口池范围限定逻辑 (#1508) 2022-03-26 10:15:18 +08:00
xiongziliang b127d8c2a9 rtsp/GB28181随机端口,支持端口范围设置 2022-03-13 20:50:25 +08:00
xiongziliang 1cf0a0cc20 bug fix 2022-03-12 14:02:12 +08:00
xiongziliang 4dc621e1bb 转协议选项抽象为ProtocolOption对象 2022-03-12 13:24:23 +08:00
ziyue d88fe077ed on_publish hook新增originType字段 2022-03-02 18:03:44 +08:00
xiongziliang 8324a9fe43 修复rtsp推流访问空指针的bug:#1456 2022-02-28 17:20:20 +08:00
xiongziliang b82cd5a500 确保ntp时间戳获取失败时,webrtc rtp重传缓存列队长度正常 2022-02-27 01:02:54 +08:00
ziyue 147ba6147c rtsp/rtp: 过滤干扰的rtp pt, 提高兼容性: #1445 2022-02-22 16:53:05 +08:00
ziyue 72caa43c97 主动关闭的流不支持断流续推: #1401 2022-02-09 14:31:40 +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
JayChen0519 a3e628449e
解决rtsp以MULTICAST方式拉流导致的奔溃问题 (#1368) 2022-01-14 13:14:30 +08:00
ziyue d52fc4c31f Refine: 优化rtsp相关代码 2022-01-12 15:24:28 +08:00
ziyue 412d280cd7 修复断连续推转协议失效的bug 2022-01-10 17:34:39 +08:00
ziyue 1dabc22347 修正错误注释 2022-01-10 17:00:25 +08:00
ziyue f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
xiongziliang 6e445614b4 申请udp端口使用全局互斥锁保护,防止端口重复分配 2022-01-08 16:07:08 +08:00