Commit Graph

84 Commits

Author SHA1 Message Date
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
老衲不出家 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 9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +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 fd4145a622 完善对rtp负载为空处理逻辑:#1661 2022-05-28 10:34:54 +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 a6e82799f5 openRtpServer接口新增re_use_port参数 2022-04-09 10:26:15 +08:00
xiongziliang b82cd5a500 确保ntp时间戳获取失败时,webrtc rtp重传缓存列队长度正常 2022-02-27 01:02:54 +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 f5f58196b5 修改常量命名 2021-10-16 16:58:03 +08:00
Xiaofeng Wang fe450ba2cb
支持生成 sdp 时指定端口 (#1161) 2021-10-15 14:10:04 +08:00
xiongziliang 4ff206fa42 兼容一些不规范的rtsp sdp: #1128 2021-09-29 01:16:52 +08:00
xiongziliang b1666eb651 实现媒体源pause/speed接口:#1129 2021-09-29 00:16:56 +08:00
ziyue 07c5341fb0 兼容一些奇怪的rtsp流:#1031 2021-08-23 21:29:23 +08:00
ziyue 298f6e3864 rtp使用ntp时间戳作为时间戳,用于实现rtsp音视频同步 2021-07-12 21:18:22 +08:00
xia-chu 842257edaa 完善rtcp ext 2021-05-06 12:02:16 +08:00
xiongziliang 012f58d27c 添加rtp 调试接口 2021-04-11 01:15:02 +08:00
xia-chu a19f67679a 兼容一些rtsp流 #735 2021-02-21 21:27:26 +08:00
xia-chu 14b318525e 添加rtp rtmp个数统计 2021-02-06 20:10:33 +08:00
xia-chu c5cfbce241 优化rtp性能 2021-02-06 20:10:33 +08:00
xia-chu 3298184c5c 添加打印rtp详情功能 2021-02-06 20:10:30 +08:00
xiongziliang e695d76ce9 整理代码 2021-01-31 21:09:25 +08:00
xiongziliang 070bf19cb5 重写rtp框架 2021-01-31 20:03:51 +08:00
xiongziliang 5c6560f55d 重写rtcp框架 2021-01-31 19:33:33 +08:00
xia-chu b6cbc87712 全面整理代码,去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang c711eedaa7 适配ZLToolKit代码,支持自定义创建Socket:#468 2020-09-12 19:03:52 +08:00
xiongziliang 30260e5414 复用printSSRC函数 2020-07-07 09:58:08 +08:00
xiongziliang 893564d0be 修复拼写错误 2020-05-25 13:51:00 +08:00
xiongziliang 8c46688886 确保rtp/rtcp端口号为偶奇数 2020-05-12 10:22:21 +08:00
xiongziliang 625d7e30c0 整理和精简代码 2020-05-11 22:33:10 +08:00
xiongziliang 3efda8fd0b 根据playload type生成track 2020-04-18 23:00:48 +08:00
xiongziliang bacf8f100b G711支持多种规格 2020-04-18 22:13:11 +08:00
xiongziliang 7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang 11420b868b 整理代码 2020-04-04 19:55:11 +08:00
xiongziliang d07161f18f 点播时间轴兼容VLC 2020-04-03 22:17:40 +08:00
xiongziliang f03365efb1 提高对echo show设备的兼容性 2020-04-03 14:09:03 +08:00
xiongziliang c145f5f8ba 修复#247 2020-03-26 17:12:21 +08:00
xiongziliang 1168174c2b tab统一替换为4个空格键:#242 2020-03-20 11:51:24 +08:00
xiongziliang a573d7302b 提高rtsp客户端兼容性 2020-01-14 18:11:10 +08:00
xiongziliang 1ce9af35e3 1、复用rtsp url解析代码
2、修复rtsp/rtmp推流异常回调紊乱的问题
2020-01-04 12:03:53 +08:00
xiongziliang 8453f822b0 修复 #66 2019-08-19 23:08:41 +08:00
xiongziliang c4f364c487 直接代理时sdp清洗后再使用 2019-08-15 19:13:31 +08:00
xiongziliang bf39cf3e33 整理优化代码 2019-06-28 16:48:02 +08:00
xiongziliang 0a2c022fa8 优化代码 2019-06-28 16:12:39 +08:00
xiongziliang e365824be2 修复multimap导致重复http头的bug 2019-06-13 18:39:57 +08:00
xiongziliang 23d793c9c2 http客户端支持多cookie 2019-06-13 11:45:13 +08:00
xiongziliang 555601506b 添加访问http目录权限事件 2019-06-12 17:53:48 +08:00
xiongziliang 304275a0e4 rtsp播放器支持rtcp 2019-05-09 13:35:54 +08:00