xiongziliang
|
12551be33c
|
提炼ProtocolOption赋值相关逻辑
|
2022-09-16 23:31:37 +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
|
5825f8b469
|
修复错误注释
|
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
|
04aa3ef41f
|
增加获取媒体流播放器列表功能
|
2022-08-30 21:05:19 +08:00 |
|
xiongzilaing
|
679c79802f
|
整理媒体事件相关代码，删除无须重载时的多余代码逻辑
|
2022-08-28 17:25:56 +08:00 |
|
xiongziliang
|
6a4297845f
|
新增发送rtp被动关闭hook
|
2022-08-27 10:53:47 +08:00 |
|
xiongziliang
|
c2ab45f78d
|
完善线程安全设计
|
2022-08-27 10:17:06 +08:00 |
ziyue
|
208b0865bd
|
修复全局变量初始化顺序错乱导致崩溃的问题
|
2022-08-23 14:11:32 +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
|
9c3b8a6a95
|
时间戳改为64位
|
2022-08-08 17:13:39 +08:00 |
CharleyWangHZ
|
2685f3cdc2
|
Update MediaSource.h
|
2022-07-28 16:43:03 +08:00 |
xiongguangjie
|
d622481619
|
fix multi aac frame in one frame result flv.js play audio error
|
2022-06-26 00:54:31 +08:00 |
|
xiongziliang
|
d30869d0c9
|
支持获取http反向代理真实客户端ip: #1388
|
2022-06-18 22:10:46 +08:00 |
|
xiongziliang
|
ba0eaf26fc
|
时间戳跳变最大阈值调整为3秒
|
2022-06-18 21:08:34 +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
|
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 |
|
xiongguangjie
|
f8373302d0
|
change srt streamid like srs srt streamid
|
2022-06-11 21:37:41 +08:00 |
|
xiongziliang
|
fd11c53a78
|
Merge branch 'feature/srt' of github.com:ZLMediaKit/ZLMediaKit
|
2022-06-11 15:07:58 +08:00 |
|
xiongziliang
|
97116e1208
|
完善getOwnerPoller相关逻辑
|
2022-06-11 13:08:58 +08:00 |
|
xiongziliang
|
b6d3ec5251
|
完善获取丢包率pull request; 新增MediaSource::getOwnerPoller接口
|
2022-06-11 12:56:03 +08:00 |
Leon
|
be995f9cd2
|
!17 【功能请求】 /index/api/getMediaList接口 增加LOSS字段用于统计每个轨道丢包率反馈
* update webrtc/WebRtcPusher.h.
* update webrtc/WebRtcPusher.cpp.
* update webrtc/WebRtcTransport.h.
* update webrtc/WebRtcTransport.cpp.
* update src/Common/MediaSource.h.
* update src/Common/MediaSource.cpp.
* update server/WebApi.cpp.
|
2022-06-11 04:31:06 +00:00 |
|
xiongguangjie
|
89b135400c
|
Merge remote-tracking branch 'origin/master' into feature/srt
|
2022-06-04 15:47:47 +08:00 |
|
xiongziliang
|
b23cbaa0f8
|
on_publish hook新增continue_push_ms参数，用于断连续推延时控制
|
2022-06-04 11:06:35 +08:00 |
|
xiongguangjie
|
b9f66ca1ec
|
add srt push string
|
2022-06-03 20:38:35 +08:00 |
|
xiongguangjie
|
1891c4e391
|
add srt push type
|
2022-06-03 15:02:07 +08:00 |
|
xiongziliang
|
ea6ef2779e
|
新增url判空逻辑
|
2022-05-29 21:36:34 +08:00 |
|
夏楚
|
e2908e9775
|
cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660)
* 解决msvc下链接问题
* CMAKE添加自动生成mk api export头文件
* 兼容非cmake构建时情况
Co-authored-by: baiyfcu <baiyfcu@gmail.com>
|
2022-05-26 20:30:43 +08:00 |
|
ziyue
|
9736badcea
|
优化编解码相关代码
|
2022-05-25 15:51:17 +08:00 |
|
xiongziliang
|
8231c5c293
|
新增GB28181 tcp passive被动发送接口(startSendRtpPassive)
|
2022-05-14 23:25:22 +08:00 |
|
xiongziliang
|
9e6ff0e798
|
优化头文件引用: #1627
|
2022-05-13 20:48:22 +08:00 |
WuPeng
|
5bc313bafe
|
增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。
|
2022-05-10 17:32:50 +08:00 |
|
ziyue
|
d037acbf62
|
完善ipv6支持
|
2022-05-08 17:06:10 +08:00 |
|
ziyue
|
a44334acaf
|
全面支持ipv6
|
2022-05-08 16:33:33 +08:00 |
|
xiongziliang
|
a95bf960e0
|
完善ipv6支持
|
2022-05-08 09:25:47 +08:00 |
|
xiongziliang
|
2818e371b8
|
完善startSendRtp接口
|
2022-04-03 18:37:22 +08:00 |
|
xgj
|
9d532cf16b
|
fix startsendrtp pt error
|
2022-04-01 19:12:37 +08:00 |
|
xgj
|
61625f458f
|
for webapi startsendrtp can send raw rtp
|
2022-04-01 18:28:09 +08:00 |
|
xiongziliang
|
b127d8c2a9
|
rtsp/GB28181随机端口，支持端口范围设置
|
2022-03-13 20:50:25 +08:00 |
|
xiongziliang
|
0f1120b8a6
|
on_publish hook新增多种选项
|
2022-03-12 14:34:48 +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 |
|
ziyue
|
4af83cbe7c
|
修复ENABLE_MEM_DEBUG时编译失败的问题
|
2022-03-01 19:00:50 +08:00 |
|
xiongguangjie
|
9c45fca761
|
根据配置禁用mmap缓存 (#1429)
|
2022-02-17 10:35:10 +08:00 |
|
ziyue
|
595182cebb
|
Revert "当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401)"
This reverts commit c97aa8483e.
|
2022-02-09 14:21:35 +08:00 |