Commit Graph

561 Commits

Author SHA1 Message Date
xiongguangjie b8729dc2a5 Merge branch 'master' into dev 2023-04-24 19:50:47 +08:00
xiongziliang de8249592e Session类构造析构跟踪日志统一在底层网络框架打印 2023-04-22 23:58:17 +08:00
xiongziliang 7a95c87a29 优化代码
空构造和析构函数替换为缺省
去除多余分号
2023-04-22 21:59:26 +08:00
xiongguangjie 5792af3dd5 fix direct_proxy is 0 repush not success 2023-03-25 20:40:40 +08:00
xiongguangjie d611a18903 rtmp repush replace pre pusher 2023-03-25 00:03:22 +08:00
xiongguangjie 67d5ca0246 rtsp push replace pre pusher 2023-03-24 23:13:25 +08:00
xia-chu 4cc2982a2c 重写jitter buffer算法,修复seq回环时可能丢包的bug 2023-03-11 10:17:31 +08:00
ziyue 23296ae5fa 加大参数冗余,提高webrtc抗丢包能力 2023-03-07 10:37:44 +08:00
ziyue d05c9d5f51 重写jitter buffer长度控制算法,提高webrtc/rtp抗丢包能力 2023-03-06 21:04:50 +08:00
xiongziliang 9fdb3de8b2 优化rtp排序抖动缓存算法,提高webrtc/rtsp抗丢包性能 2023-03-06 00:31:11 +08:00
xiongziliang c2e1083493 复用rtp/rtcp判断逻辑过滤非rtp包: #2247 2023-02-28 22:23:30 +08:00
ziyue f5755a17e7 合并 #2183 2023-01-02 12:08:20 +08:00
ziyue 08c47ff4f0 Merge branch 'feature/editable_rtsp_sdp' of github.com:a-ucontrol/ZLMediaKit 2023-01-02 11:59:56 +08:00
Ikko Ashimine fda77f0daf !23 fix typo in RtspSession.cpp
* fix typo in RtspSession.cpp
2022-12-30 17:25:58 +08:00
Alexandr dc26bbf145 protected virtual bool sendRtspResponse(...) 2022-12-30 08:50:30 +03:00
a-ucontrol eed5f02380
rtsp/rtp 新增支持mjpeg编码 (#2166)
* Trying to send mjpeg via MultiMediaSourceMuxer

* Improved JPEGRtpEncoder::inputFrame code but still not working

* 优化代码

* 完善jpeg相关逻辑

* Micro fix

* FrameJPEG renamed to JPEGFrame according to ZLM style

* Modified  JPEGRtpEncoder::inputFrame and JPEGRtpEncoder::rtp_send_jpeg

* getVideoHeight(), getVideoWidth() and getVideoFps() in JPEGTrack

* mjpeg rtp打包避免内存拷贝/修复mjpeg rtp解包huffman_table size字段错误的bug

* 支持mjpeg pix type

* 优化性能

* add bom header
2022-12-21 15:32:16 +08:00
monktan89 56ccd4332a 提高rtsp播放器兼容性: #2159 2022-12-14 15:08:24 +08:00
老衲不出家 f05a9501fa
Unified code style (#2137) 2022-12-02 14:43:06 +08: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
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