Commit Graph

185 Commits

Author SHA1 Message Date
xiongziliang b351f4c7e5 优化日志提示 2022-06-18 21:06:18 +08:00
custompal 771844d065
去除rtp_sender_mtx (#1722)
* 去除rtp_sender_mtx
* 无人观看定时器指定为MediaSource对象所属poller以确保读取观看数是线程安全的

Co-authored-by: xiongziliang <771730766@qq.com>
2022-06-18 13:22:57 +08:00
xiongguangjie b22e1cf937 fix g711u or g711a rtp judge error 2022-06-16 10:04:46 +08:00
xiongguangjie 5479820748 const payload type variable start's letter is lower case 2022-06-16 09:59:09 +08:00
xiongguangjie 6a337adc91 for rtp server can config pt 2022-06-15 00:20:53 +08:00
xiongziliang 93201f40d3 优化日志提示 2022-05-28 09:47:48 +08:00
xiongziliang 30dbac2c70 提高对不规范GB28181流的兼容性,防止视频轨道被忽略 2022-05-20 21:52:53 +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
xiongziliang b4166d5cfe 修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635 2022-05-14 17:14:38 +08:00
ziyue 9861091b18 优先使用ipv4地址 2022-05-10 14:48:05 +08:00
ziyue 45494c020b bug fixed 2022-05-10 10:44:12 +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
ziyue 200a193c04 openRtpServer新增ssrc参数修改为追加至函数末尾, 确保代码逻辑一致无歧义: #1572 2022-04-28 17:44:35 +08:00
wangcker e712639e33
openrtpserver接口新增ssrc参数,强制过滤不属于本端口的视频流,以解决视频串流问题 (#1572) 2022-04-16 15:12:49 +08:00
xiongziliang a1b350c9f0 startSendRtp接口udp发送不指定端口时,从端口池获取端口 2022-04-09 10:33:27 +08:00
xiongziliang a6e82799f5 openRtpServer接口新增re_use_port参数 2022-04-09 10:26:15 +08:00
xiongziliang 8da23da35c 添加utf-8 bom头 2022-04-03 18:38:07 +08:00
xiongziliang 2818e371b8 完善startSendRtp接口 2022-04-03 18:37:22 +08:00
xgj 61625f458f for webapi startsendrtp can send raw rtp 2022-04-01 18:28:09 +08:00
xiongziliang 4dc621e1bb 转协议选项抽象为ProtocolOption对象 2022-03-12 13:24:23 +08:00
alexliyu7352 4be3c349be
mpeg-ts解析丢弃不完整的包 (#1478)
* 丢弃不正确的包

因为网络抖动或者拉流超时导致ts包不全.
这里丢弃掉有问题的包, 避免客户端解码中断

* Update TSDecoder.cpp

* 格式化代码

Co-authored-by: 夏楚 <771730766@qq.com>
2022-03-12 09:41:15 +08:00
ziyue d88fe077ed on_publish hook新增originType字段 2022-03-02 18:03:44 +08:00
xiongziliang 45d9bcd5f4 ts解析失败时清空split缓存 2022-02-13 22:02:16 +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 81cf93a2bf openRtpServer接口强制关闭reuse_port属性,防止端口冲突 2022-01-19 17:44:58 +08:00
wangcker e8b0993493
给openrtpserver接口添加enable_reuse参数 (#1372)
* 修改rtpopen逻辑

* 给openrtpserver接口添加enable_reuse端口
2022-01-14 21:53:01 +08:00
ziyue 5b6ff0af27 完善mingw编译环境的适配 2022-01-11 14:09:57 +08:00
ziyue 89870190e9 MPEG: 整合复用ts/ps生成代码 2021-12-28 21:21:01 +08:00
ziyue 5832de7ed8 HLS: ts分包器主动丢弃非法数据 2021-12-24 14:25:01 +08:00
ziyue 84baf920c1 GB28181: ps解析失败触发断言时,丢弃所有数据 2021-12-01 17:02:06 +08:00
ziyue afdc5e4267 Refine: 优化tcp/udp服务器异常管理断开机制 2021-11-19 15:26:33 +08:00
ziyue b13a0f5b79 Splitter: 全局限制内存使用量,防止内存溢出 2021-11-19 11:27:27 +08:00
ziyue 0281cb6a11 GB28181: 修复tcp推流时,流异常可能导致死循环的bug 2021-11-19 11:09:55 +08:00
ziyue 37fdb8d135 MediaSource: 继承改成私有 2021-11-10 11:38:54 +08:00
ziyue 74aa2ba07f 修复GB28181推流显示设备端口错误的问题:#1160 2021-10-16 17:32:20 +08:00
Johnny c98e85caec 增加 RtcpContextForSend/RtcpContextForRecv作为RtcpContext子类 2021-10-15 11:21:10 +08:00
ziyue 3bc0769ccb 完善mk_media接口 2021-09-27 14:34:26 +08:00
ziyue e9008afca0 addTrack/inputFrame接口支持返回值;新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
zqsong 23ae6911ab
Update GB28181Process.cpp
修复ENABLE_MP4 false时编译报错
2021-09-04 09:38:23 +08:00
ziyue 415bc95dda 完善ntp时间戳计算逻辑 2021-09-02 21:39:10 +08:00
xiongziliang 41c09757a7 解决GB28181推流无ntp时间戳导致的问题 2021-08-21 18:52:52 +08:00
ziyue 10522e4ea5 完善getOriginUrl接口 2021-08-16 17:31:13 +08:00
monktan 7ed7e5386c rtp包最大大小可配置 2021-08-11 15:48:15 +08:00
ziyue 10eb063f63 rtp时间戳采用pts 2021-07-27 10:16:35 +08:00
xiongziliang 49f59fb993 Merge branch 'feature/ps-decoder-cache-buffer' of https://github.com/xia-chu/ZLMediaKit 2021-07-18 19:43:12 +08:00
wxf 2f82c89278 忽略海康 PS 流中的 0xBD 包 2021-07-18 17:31:27 +08:00
wxf 9dd602c242 GB28181Process: 不再需要缓存未处理完的 PS/TS 帧
* PS 帧已由 PSDecoder 缓存;
* TS 帧在 TSDecoder 中有判断是否为 TS, 即使出错缓存也无意义;
2021-07-18 15:08:49 +08:00
wxf 5172b846d3 PSDecoder: 缓存未处理完的数据 2021-07-18 15:08:44 +08:00