Commit Graph

1920 Commits

Author SHA1 Message Date
xiongguangjie 0a71e06d4a united some code style 2022-10-19 14:55:39 +08:00
xiongguangjie 7b87985f74 Merge remote-tracking branch 'origin/master' 2022-10-19 14:27:49 +08:00
xiongguangjie 0d2e035215 rtsp and rtp h264 lowlatency mode config 2022-10-19 14:20:53 +08:00
ziyue ff6e9f4fc7 修复流注销时,hls无法播完最后一个切片的问题: #1955 2022-10-18 19:23:20 +08:00
ziyue ac1abb34da 新增媒体流flush机制:#1996 2022-10-16 19:54:17 +08:00
ziyue 80eef693c6 精确mp4录制时长:#1795 2022-10-16 16:44:54 +08:00
xiongguangjie bbdcc44eb0 mute audio maker avoid uint32_t cycle and 8k aac a frame is 128ms 2022-10-11 16:53:27 +08:00
ziyue 2b64245c14 优化代码 2022-10-08 10:47:09 +08:00
xiongziliang c790254f46 修复关闭mp4录制不能触发无人观看事件问题:#2010 2022-10-06 13:06:54 +08:00
ziyue 34838b1b26 rtmp点播采用简单握手,发送心跳包,兼容fms服务器: #2007 2022-09-30 13:36:43 +08:00
xiongguangjie bfebcd62c7 rtp packet sort set init seq 2022-09-28 15:29:11 +08:00
xiongguangjie 9f716dd8b8 fix gb startsendpassive use random port return immediately not wait 2022-09-26 15:50:02 +08:00
夏楚 037dd646d1
Merge pull request #1994 from Dw9/master
修复rtsp 推pcm L16, 空指针的异常
2022-09-26 10:27:30 +08:00
Dw9 6f1a45db8a 修复推rtsp L16崩溃 2022-09-25 12:13:09 +08:00
夏楚 b9a4b3e71a
消除编译警告 2022-09-24 19:07:45 +08:00
ziyue 15affeff1d 优化关闭媒体源相关逻辑: #1963 2022-09-18 20:36:47 +08:00
xiongziliang 12551be33c 提炼ProtocolOption赋值相关逻辑 2022-09-16 23:31:37 +08:00
custompal 08789454c3
rtsp支持指定播放单一track (#1937) 2022-09-13 16:27:00 +08:00
夏楚 4a35ddbddb
Merge pull request #1942 from mtdxc/reduce_code
简化代码
2022-09-09 11:10:55 +08:00
custompal d853075175
RtpServer新增tcp主动模式支持 (#1938) 2022-09-09 10:56:28 +08:00
cqm 999e0b274e 简化代码:
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
2022-09-07 11:47:15 +08:00
WuPeng f765e5365b 修正在指定配置文件forwarded_ip_header的值后,无法获取不通过代理播放的客户端IP。 2022-09-06 21:13:11 +08:00
ziyue 4f47b7a5fe 修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题 2022-09-05 14:59:46 +08:00
xiongziliang 5825f8b469 修复错误注释 2022-09-03 16:32:10 +08:00
xiongziliang 06c6654ed5 精简代码 2022-09-03 16:32:10 +08:00
xiongziliang c8ea6490cd 修复直接拉流代理时同协议流无法注册的问题 2022-09-03 16:32:10 +08:00
xiongziliang 20f1275c58 rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877 2022-09-03 16:32:09 +08:00
PioLing 0948a3df31
支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930) 2022-09-03 09:54:09 +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
xiongziliang f0ae5a1bd7 优化日志提示 2022-08-27 11:00:24 +08:00
xiongziliang 0cab9c8d16 rtp发送去除重连机制 2022-08-27 10:59:15 +08:00
xiongziliang 6a4297845f 新增发送rtp被动关闭hook 2022-08-27 10:53:47 +08:00
xiongziliang c2ab45f78d 完善线程安全设计 2022-08-27 10:17:06 +08:00
rqb500 00acea369e
修复接收rtsp、gb28181等rtp流转为其他协议播放时可能卡顿的bug (#1906)
* 修复获取ntp_stamp时计算溢出的bug
2022-08-26 11:42:40 +08:00
ziyue 44ba971cb6 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-08-23 14:13:36 +08:00
ziyue 208b0865bd 修复全局变量初始化顺序错乱导致崩溃的问题 2022-08-23 14:11:32 +08:00
Xiaofeng Wang a06b4321be cmake: fix install cxx api headers
Close #1882
2022-08-22 13:11:17 +08:00
xiongziliang c6a0e3ad66 rtp发送启停支持触发观看人数统计事件 2022-08-20 13:16:25 +08:00
xiongziliang 9f0c15a4f0 startSendRtp接口支持rtcp接收超时主动停止 2022-08-20 12:48:27 +08:00
Dw9 30984d2076
mp4录制支持作为观看者参与播放人数统计 (#1880) 2022-08-16 11:47:24 +08:00
ziyue 6382fcb3be 确保on_publish事件回调时线程安全 2022-08-11 18:36:17 +08:00
ziyue b34db64961 修复非法aac rtp包导致的除0崩溃问题: #1869 2022-08-10 10:44:34 +08:00
ziyue 795b4dbbd3 修复http文件服务器对特殊字符文件不兼容的bug:#1866 2022-08-10 10:37:49 +08:00
ziyue 099845b329 FMP4Packet时间戳类型改成64位 2022-08-08 17:57:29 +08:00
ziyue 35791aac89 优化代码,去除编译警告,修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue 9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
ziyue 143580d780 修复编译警告 2022-08-08 15:28:43 +08:00
ziyue 663d167837 格式化代码 2022-08-05 17:55:48 +08:00