xiongguangjie
|
09a8d53150
|
Merge remote-tracking branch 'origin/master'
|
2022-07-07 17:46:37 +08:00 |
|
xiongguangjie
|
4108e81d2f
|
avoid multi rtmp player metadata
|
2022-07-07 17:44:19 +08:00 |
|
Dw9
|
c4988e7cfc
|
修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 )
|
2022-07-07 16:56:54 +08:00 |
|
xiongziliang
|
121b78e5dd
|
推流器主动断开时,避免开启断流续推功能
|
2022-07-02 15:36:44 +08:00 |
|
xiongziliang
|
7a24a22661
|
完善推流判断逻辑
|
2022-07-02 13:13:16 +08:00 |
|
xiongguangjie
|
87dd1c7f7f
|
avoid loopback ffmpeg push stream exit receive deleteStream message after broken pipe
|
2022-07-02 12:33:32 +08:00 |
|
alexliyu7352
|
9314a6699b
|
兼容ffmpeg4.x (#1758)
|
2022-06-29 11:02:43 +08:00 |
|
CharleyWangHZ
|
28350c0d05
|
Optimize Decoder inheritance relationship (#1760)
|
2022-06-29 11:01:16 +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 |
|
xiongguangjie
|
266aaf9e0b
|
fix rtsp and rtmp on_flow_report player or pusher judge error
|
2022-06-24 09:06:46 +08:00 |
|
baiyfcu
|
9acd1c2b36
|
修复on_flow_report player状态
|
2022-06-23 18:08:21 +08:00 |
|
Dw9
|
1c5380eead
|
Update MP4Recorder.cpp
fix #1679
_muxer->openMP4 创建非法的文件夹会失败抛出异常 所以_full_path_tmp等都是空字符串
delete_file的时候 就会从此盘符的""(full_path_tmp)目录挨个删除了。
复现建议新建个盘符...
|
2022-06-19 17:27:03 +08:00 |
|
xiongziliang
|
d30869d0c9
|
支持获取http反向代理真实客户端ip: #1388
|
2022-06-18 22:10:46 +08:00 |
|
xiongziliang
|
6291ee704c
|
http文件服务器修复访问安全漏洞
|
2022-06-18 21:44:16 +08:00 |
|
xiongziliang
|
d72af3e61a
|
兼容不规范的rtsp url: #904
|
2022-06-18 21:19:26 +08:00 |
|
xiongziliang
|
ba0eaf26fc
|
时间戳跳变最大阈值调整为3秒
|
2022-06-18 21:08:34 +08:00 |
|
xiongziliang
|
b351f4c7e5
|
优化日志提示
|
2022-06-18 21:06:18 +08:00 |
|
xiongziliang
|
7f98f9a750
|
删除重复的获取gmt offset相关代码
|
2022-06-18 13:27:23 +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
|
fe652e46b4
|
rtmp session when client stop publish not set push src null avoid judge player or pusher error
|
2022-06-16 10:57:48 +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 |
|
xiongguangjie
|
f8373302d0
|
change srt streamid like srs srt streamid
|
2022-06-11 21:37:41 +08:00 |
|
xiongziliang
|
8fba694473
|
注释多余代码,消除编译警告
|
2022-06-11 15:14:14 +08:00 |
|
xiongziliang
|
fd11c53a78
|
Merge branch 'feature/srt' of github.com:ZLMediaKit/ZLMediaKit
|
2022-06-11 15:07:58 +08:00 |
|
xiongziliang
|
f6b4eb418f
|
优化录制相关代码
|
2022-06-11 14:18:55 +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
|
df9a9649b0
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
|
2022-06-04 11:08:13 +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 |
|
taojishou
|
59dcd03b70
|
修改hls拉流后closestream崩溃的bug (#1678)
* 修改hls拉流后closestream崩溃的bug
Co-authored-by: 夏楚 <771730766@qq.com>
|
2022-06-01 13:05:49 +08:00 |
|
xiongziliang
|
cea30f8180
|
修复低版本gcc编译问题:#1667
|
2022-05-29 22:13:07 +08:00 |
|
xiongziliang
|
ea6ef2779e
|
新增url判空逻辑
|
2022-05-29 21:36:34 +08:00 |
|
xiongziliang
|
fd4145a622
|
完善对rtp负载为空处理逻辑:#1661
|
2022-05-28 10:34:54 +08:00 |
|
xiongziliang
|
6596eec069
|
Merge branch 'rtc_audio_delay' of github.com:mtdxc/ZLMediaKit
|
2022-05-28 10:21:48 +08:00 |
|
xiongziliang
|
93201f40d3
|
优化日志提示
|
2022-05-28 09:47:48 +08:00 |
|
cqm
|
3110284302
|
修复rtc单独播放音频延时高问题
|
2022-05-27 09:39:03 +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
|
cb0e5c6c57
|
全面更新整理c sdk
|
2022-05-25 15:51:24 +08:00 |
|
ziyue
|
9736badcea
|
优化编解码相关代码
|
2022-05-25 15:51:17 +08:00 |
|
ziyue
|
fa70af7cce
|
移动FFmpeg相关代码
|
2022-05-25 15:51:02 +08:00 |
|
xiongziliang
|
30dbac2c70
|
提高对不规范GB28181流的兼容性,防止视频轨道被忽略
|
2022-05-20 21:52:53 +08:00 |
|
xiongguangjie
|
b61cce85bd
|
修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) (#1644)
|
2022-05-19 19:01:23 +08:00 |
|
ziyue
|
c7d7999f53
|
兼容gcc4.8编译器
|
2022-05-18 20:07:54 +08:00 |
|
xiongziliang
|
251fe1f77c
|
优化随机端口分配逻辑
|
2022-05-14 23:34:33 +08:00 |
|