Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-28 21:14:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,623 Commits 20 Branches 0 Tags
5f6fe223ca81928ffb6e28549cc205af36a289b3
Commit Graph

104 Commits

Author SHA1 Message Date
YuLi
7563db36bb fix: restore SRT transport cleanup on session error (#4777) 
### Motivation
- Restore the transport cleanup path on SRT session errors so
`SrtTransport::onShutdown` runs its unregister logic and prevents
unbounded growth of weak_ptr entries in the transport manager that could
lead to a memory-exhaustion DoS.

### Description
- Re-enabled shutdown cleanup in `srt/SrtSession.cpp` by capturing `err`
in the delayed callback and calling `transport->onShutdown(err)` from
the `getPoller()->async` lambda.

### Testing
- Ran `cmake -S . -B build` to sanity-check configuration; configuration
failed in this environment due to a missing `3rdpart/ZLToolKit`
submodule and unrelated CMake errors, not due to the patch.

------
[Codex
Task](https://chatgpt.com/codex/cloud/tasks/task_e_69b32b68f8ac8320b6a9b0fad53594c6)

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
 2026-07-13 11:03:00 +08:00
xia-chu
437d20cb58 修复srt客户端不支持域名url的bug 2025-11-04 18:36:43 +08:00
mtdxc
a3eb07adfc move srt src like webrtc (#4471) 2025-09-24 16:45:35 +08:00
baigao-X
3fb43c5fef feat: 增加webrtc代理拉流 (#4389) 
- 增加客户端模式，支持主动拉流、推流：
   - addStreamProxy接口新增支持whep主动拉流，拉流地址目前只兼容zlm的whep url。
   - addStreamPusherProxy接口新增支持whip主动推流，推流地址目前只兼容zlm的whip url。
   - 以上推流url格式为webrtc[s]://server_host:server_port/app/stream_id?key=value, 内部会自动转换为http[s]://server_host:server_port/index/api/[whip/whep]?app=app&stream=stream_id&key=value。

- 增加WebRtc p2p 模式：
  - 增加 ICE FULL模式。
  - 增加STUN/TURN 服务器。
  - 增加websocket 信令。
  - 增加P2P代理拉流。

---------

Co-authored-by: xia-chu <771730766@qq.com>
Co-authored-by: mtdxc <mtdxc@126.com>
Co-authored-by: cqm <cqm@97kid.com>
 2025-09-20 16:23:30 +08:00
xia-chu
5686027fc2 修复MediaSource::close线程安全问题 
主动或无人观看关闭流可能会由于线程安全问题导致崩溃
 2025-09-09 22:02:20 +08:00
xia-chu
57fede9508 修复编译警告 2025-08-09 15:42:28 +08:00
baigao-X
9d18015e32 fix: SrtCaller and SrtSession crash (#4328) 
1.修改SrtCaller 多线程发送造成的crash
2.修改SrtCaller 接收的期望外的控制包可能造成的空指针引用
3.修改异常的streamid ext可能造成的crash
 2025-07-26 15:43:36 +08:00
custompal
f0204ea3b3 播放器(reader)setGetInfoCB时统一使用Session对象 (#4195) 
Co-authored-by: custompal <chenrengen@gosuncn.com>
 2025-03-21 15:22:48 +08:00
xiongguangjie
b66806deb6 update srt readme (#4153) 2025-02-19 15:04:12 +08:00
xiongguangjie
ac6bb9b332 Improve srt print and check pusher (#4113) 2025-01-12 10:01:35 +08:00
PioLing
9863f9c160 Add logo and version information to exe on windows (#4093) 2025-01-03 11:33:35 +08:00
baigao-X
1c8ed1c55a Add srt caller mode and stream encryption support. (#4088) 
Add srt caller mode and stream encryption support.
1. Support srt caller mode, realize srt proxy pull stream proxy push
stream;
url parameter format such as: srt://127.0.0.1:9000?streamid=#!
::r=live/test11
2. Support srt stream encrypted transmission in caller and listener
mode.

---------

Co-authored-by: xiongguangjie <xiong_panda@163.com>
 2024-12-28 20:21:29 +08:00
xiongguangjie
87277ac91a Optimaztion code for srt (#3934) 2024-09-28 10:11:39 +08:00
alex
4152dcd409 AI automatically translates all comments in the code into English (#3917) 2024-09-19 14:53:50 +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
johzzy
f49aed7a32 srt optimization code for query poller (#3334) 
- add querySrtTransport, improve code.
- update SrtTransportManager key
- fix some warning
 2024-03-02 18:25:32 +08:00
夏楚
64f15202de Support multi audio/video track 2023-12-09 22:34:22 +08:00
夏楚
bbe8f4a018 release 8.0 2023-12-09 16:23:51 +08:00
夏楚
76aebd74c6 整理MediaSource协议类型 2023-12-02 16:31:40 +08:00
xia-chu
39dd886ec1 优化获取播放器列表相关功能 2023-09-02 12:07:42 +08:00
xia-chu
d286ac1d73 NoticeCenter支持安全类型转换，解决监听者参数类型不一致导致的bug 2023-09-02 11:22:28 +08:00
夏楚
5ca4ed53b2 防止析构函数抛异常导致崩溃问题 (#2546) 2023-06-11 22:07:15 +08:00
Johnny
0232caf068 add MediaTuple 2023-05-30 11:01:27 +08:00
xia-chu
cdf97e7605 更新zltoolkit,适配最新代码 2023-04-28 22:04:09 +08:00
xiongziliang
c8a20f85f6 直接打印SockException类 2023-04-23 00:10:18 +08:00
xiongziliang
de8249592e Session类构造析构跟踪日志统一在底层网络框架打印 2023-04-22 23:58:17 +08:00
xiongguangjie
a390042f38 srt push check audio and video timestamp sync 2023-03-25 20:32:21 +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
ziyue
68948288e0 TcpSession/UdpSession统一为Session类 2022-11-19 09:33:10 +08:00
xiongziliang
946945ce7b 优化代码 
整理代码
 2022-11-12 22:06:09 +08:00
ziyue
ac1abb34da 新增媒体流flush机制：#1996 2022-10-16 19:54:17 +08:00
夏楚
2f9b3e187b Merge pull request #1984 from Dw9/master 
c api support srt server
 2022-09-23 14:29:12 +08:00
xiongguangjie
c363b30360 srt optimize ack send logic ignore too many ack packet 2022-09-23 09:35:10 +08:00
Dw9
43bf7c7918 c api support srt server 2022-09-22 21:18:34 +08:00
xiongguangjie
02aad5d256 srt avoid ack time map memory not release 2022-09-22 19:21:14 +08:00
xiongguangjie
a74a9ec0d7 remove srt debug log 2022-09-22 12:03:53 +08:00
xiongguangjie
801f705628 fix srt ack packet packet buf length error 2022-09-22 12:00:02 +08:00
xiongguangjie
642ca4997a add more dump 2022-09-22 01:07:10 +08:00
xiongguangjie
533f35dac4 copy srt estimated link capacity algorithm 2022-09-22 00:34:42 +08:00
xiongguangjie
ea35002be8 copy srt official packet recve rate algorithm 2022-09-21 19:21:49 +08:00
xiongguangjie
ec1942fa81 srt connection transfer support 2022-09-20 00:39:42 +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
custompal
ce545aa74f Merge branch 'master' into cus_pr 2022-09-01 16:56:44 +08:00
KevinZang
3585e9f7bc 增加VLC如何播放SRT协议说明 (#1929) 2022-09-01 15:53:19 +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
xiongguangjie
67ad2a49c3 srt is player stop handleshake timert 2022-08-27 15:18:32 +08:00
xiongguangjie
f9f6fd136a srt handle packet send repeate by timer 2022-08-27 15:06:03 +08:00