xia-chu
|
021f09e62b
|
优化精简媒体事件相关逻辑代码
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
|
2025-11-23 19:07:48 +08:00 |
|
xia-chu
|
5686027fc2
|
修复MediaSource::close线程安全问题
主动或无人观看关闭流可能会由于线程安全问题导致崩溃
|
2025-09-09 22:02:20 +08:00 |
|
xia-chu
|
f524a0ebbd
|
配置文件auto_close开启后也触发无人观看hook(不处理回复)
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
|
2025-08-23 10:43:32 +08:00 |
|
yingxiaodong
|
8f3c01043f
|
问题修正：解决loadMP4File崩溃问题时，引入的getOwnerPoller失败 (#4390)
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
|
2025-08-11 20:35:10 +08:00 |
|
yingxiaodong
|
d2e099bd23
|
BUG修正：loadMP4File播放文件时，无人观看触发关闭，导致程序崩溃 (#4387)
关闭文件播放的处理与文件播放动作不在一个线程，导致崩溃。
|
2025-08-09 14:37:54 +08:00 |
|
PioLing
|
7b1f8fedac
|
Add network traffic statistics (#4239)
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Co-authored-by: xiongguangjie <xiong_panda@163.com>
Co-authored-by: xia-chu <771730766@qq.com>
|
2025-05-02 16:23:25 +08:00 |
|
alex
|
4152dcd409
|
AI automatically translates all comments in the code into English (#3917)
|
2024-09-19 14:53:50 +08:00 |
|
mtdxc
|
d735aa1797
|
Media tuple refactor (#3715)
Co-authored-by: cqm <cqm@97kid.com>
|
2024-07-14 09:32:41 +08:00 |
|
xia-chu
|
5470049076
|
精简ProtocolOption相关代码
|
2024-06-28 19:40:46 +08:00 |
|
PioLing
|
f9f386bc23
|
修改完善MediaSource事件拦截器 (#3622)
|
2024-06-14 12:59:02 +08:00 |
|
xiongziliang
|
77d2df1695
|
移除RtpSelector相关逻辑，优化代码结构
|
2024-06-09 10:52:10 +08:00 |
|
KkemChen
|
373620cfc6
|
feat: add broadcast event for player count change (#3562)
|
2024-05-23 10:30:11 +08:00 |
|
xia-chu
|
af3ef996b0
|
Avoid build warnings in the main code
|
2024-03-30 14:59:28 +08:00 |
|
xia-chu
|
390c374086
|
Optimize the code
1. change param_strs to params
2. move params from MediaInfo to MediaTuple
3. passing MediaTuple as a parameter for some functions
|
2024-03-30 14:41:20 +08:00 |
|
夏楚
|
bbe8f4a018
|
release 8.0
|
2023-12-09 16:23:51 +08:00 |
|
夏楚
|
76aebd74c6
|
整理MediaSource协议类型
|
2023-12-02 16:31:40 +08:00 |
|
夏楚
|
21c03f772f
|
新增平滑发送逻辑 (#3072)
|
2023-12-02 10:20:06 +08:00 |
|
xia-chu
|
d286ac1d73
|
NoticeCenter支持安全类型转换，解决监听者参数类型不一致导致的bug
|
2023-09-02 11:22:28 +08:00 |
|
xia-chu
|
2378617dd8
|
修复前向声明导致的编译问题
|
2023-08-08 16:06:29 +08:00 |
|
夏楚
|
beae515bb2
|
新增无人观看自动关闭流(无须hook返回)功能 (#2643)
auto_close参数适用于配置文件、addStreamProxy接口、on_publish hook
|
2023-07-08 21:36:34 +08:00 |
|
夏楚
|
e52c1cc510
|
修复addFFmpegSource添加的流事件拦截可能失效问题 (#2642 #2629)
此pr主要为了修复 #2629，通过新增getMuxer接口，
可以直接获取到所有协议共享的MultiMediaSourceMuxer对象，
在此对象完成事件拦截，防止某种协议事件丢失。
同时调整了下FFmpegSource.cpp代码格式。
|
2023-07-08 21:35:09 +08:00 |
|
XiaoYan Lin
|
cb0579a16d
|
新增支持hls-fmp4直播(#2603 #977 #1965)
同时主要优化点包括：
1、编译宏特性开关优化。
2、转协议复用器相关创建代码移动至Recorder类。
3、转协议复用器onAllTrackReady函数修改为addTrackCompleted。
4、startRecord/stopRecord/isRecording接口新增支持ts/fmp4/hls-fmp4协议。
Co-authored-by: xia-chu <771730766@qq.com>
Co-authored-by: linxiaoyan87 <linxiaoyan87@foxmail.com>
|
2023-07-02 12:02:33 +08:00 |
|
johzzy
|
03770ff409
|
Replace the tuple (vhost/app/stream) with MediaTuple. (#2560)
|
2023-06-17 10:28:01 +08:00 |
|
夏楚
|
5ca4ed53b2
|
防止析构函数抛异常导致崩溃问题 (#2546)
|
2023-06-11 22:07:15 +08:00 |
|
夏楚
|
e4acc59bec
|
媒体时间戳默认改为相对时间戳，通过时间戳矫正器解决跳跃和回退问题 (#2523)
通过用户反馈发现，遇到较多直播源时间戳混乱问题，包括rtsp流之rtcp ntp时间戳混乱，国标流时间戳混乱问题。
之前默认采用源流绝对时间戳，但是由于时间戳混乱会导致hls切片异常或视频播放不了等问题。
故默认改成相对时间戳(modify_stamp=2)，通过时间戳矫正器过滤了时间戳跳跃以及回退问题(强制加1ms)，
同时保留了对之前时间戳覆盖(modify_stamp=1)的兼容。
该修改同时兼容点播流，在点播流开启时间戳覆盖时，不起实质作用(采用原始绝对时间戳)。
|
2023-06-03 17:34:34 +08:00 |
|
Johnny
|
0232caf068
|
add MediaTuple
|
2023-05-30 11:01:27 +08:00 |
|
Dw9
|
978143c86d
|
rtp级联(ps/ts/es)新增支持gop缓存功能 (#2395)
该修改主要解决rtp级联(调用startSendRtp接口)未做gop缓存导致上级无法秒开的问题。
同时通过RingBuffer对象线程隔离的特性，实现了在断连续推场景下归属线程切换导致的线程安全问题。
用户如未使用rtp级联功能，请修改配置文件关闭GOP缓存(rtp_proxy.gop_cache=0)以便节省内存。
---------
Co-authored-by: 夏楚 <771730766@qq.com>
|
2023-04-17 12:19:24 +08:00 |
|
xia-chu
|
ba4296e180
|
修复断连续推情况下线程迁移导致崩溃的bug:#2283
如果一个MultiMediaSourceMuxer对象上挂载了很多个RtpSender对象，
这些对象会绑定MultiMediaSourceMuxer的OwnerPoller(归属线程)，
在断连续推发生时，对应的MultiMediaSourceMuxer对象OwnerPoller线程
将发生变更，导致与RtpSender对象的线程不一致。
|
2023-03-11 10:34:58 +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 |
|
xiongziliang
|
50fa671564
|
修复析构中调用getOwnerPoller抛异常导致崩溃的bug:#2117
|
2022-11-26 10:16:47 +08:00 |
|
ziyue
|
68948288e0
|
TcpSession/UdpSession统一为Session类
|
2022-11-19 09:33:10 +08:00 |
|
xiongziliang
|
9bb6a2f828
|
全面整理转协议相关配置文件
|
2022-11-12 23:56:28 +08:00 |
|
xiongziliang
|
b54f50c7c0
|
修复hls流注销时相关bug:#2082
|
2022-11-12 09:57:47 +08:00 |
|
ziyue
|
520945c2e9
|
提高线程安全性
|
2022-11-01 10:53:38 +08:00 |
|
ziyue
|
15affeff1d
|
优化关闭媒体源相关逻辑: #1963
|
2022-09-18 20:36:47 +08:00 |
|
cqm
|
999e0b274e
|
简化代码:
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
|
2022-09-07 11:47:15 +08:00 |
|
xiongziliang
|
20f1275c58
|
rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877
|
2022-09-03 16:32:09 +08:00 |
|
xiongzilaing
|
679c79802f
|
整理媒体事件相关代码，删除无须重载时的多余代码逻辑
|
2022-08-28 17:25:56 +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 |
|
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 |
|
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
|
b9f66ca1ec
|
add srt push string
|
2022-06-03 20:38:35 +08:00 |
|
ziyue
|
d037acbf62
|
完善ipv6支持
|
2022-05-08 17:06:10 +08:00 |
|
xiongziliang
|
a95bf960e0
|
完善ipv6支持
|
2022-05-08 09:25:47 +08:00 |
|
xiongziliang
|
2818e371b8
|
完善startSendRtp接口
|
2022-04-03 18:37:22 +08:00 |
|