xia-chu
|
4e170e9281
|
addStreamProxy新增force，支持强制重试拉流
|
2026-03-17 19:33:43 +08:00 |
|
xia-chu
|
ca47a1f8b2
|
http access事件新增文件绝对路径参数
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
Linux_Python / build (push) Has been cancelled
macOS / build (push) Has been cancelled
macOS_Python / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Windows_Python / build (push) Has been cancelled
|
2026-03-09 18:01:48 +08:00 |
|
夏楚
|
6d520ea6a3
|
新增支持Python混合编程模式 (#4579)
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
Linux_Python / build (push) Has been cancelled
macOS / build (push) Has been cancelled
macOS_Python / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Windows_Python / build (push) Has been cancelled
|
2026-02-10 13:28:42 +08:00 |
|
xia-chu
|
97d2a1fb08
|
修复溯源url模板带参数时溯源失败的问题
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-09-12 21:50:30 +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 |
|
xia-chu
|
dd1e8ef430
|
web hook 忽略返回值为null的值
|
2025-04-20 14:50:56 +08:00 |
|
xiongguangjie
|
2a85dffdf9
|
on_play/on_publish hook 新增protocol字段 (#4133 #4143)
对于webhook 涉及到media info的相关信息，增加protocol 的字段，表明是基于什么协议传输的
|
2025-02-13 15:18:47 +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 |
|
zhang2349
|
c72e576420
|
rtp server新增支持自定义vhost和app名称 (#3693)
代码来自https://github.com/ZLMediaKit/ZLMediaKit/pull/3446 ， 增加了vhost
|
2024-07-09 10:42:10 +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 |
|
alexliyu7352
|
86029d08af
|
addStreamProxy支持透传参数并设置MediaPlayer (#3063)
通过addStreamProxy接口可以直接配置MediaPlayer相关设置参数，比如说http代理url等
|
2023-12-01 14:33:07 +08:00 |
|
Fummo
|
88f7f46497
|
Bugfix: Only close edge streams with no viewers (#2994)
Bugfix to only close streams with no viewers if they
originate from an edge server rather than all streams.
Fixes https://github.com/ZLMediaKit/ZLMediaKit/issues/2981
|
2023-11-19 14:35:18 +08:00 |
|
ljx0305
|
7ee2d66eaa
|
统一代码命名风格 (#2910)
openRtpServer时，如果开启tcp模式，从tcp端口池获取
|
2023-10-19 17:55:30 +08:00 |
|
夏楚
|
e628cba1ca
|
新增配置项过滤on_stream_changed hook协议类型 (#2759)
配置项hook.stream_changed_schemas可指定监听感兴趣的协议
|
2023-08-14 00:05:32 +08:00 |
|
夏楚
|
f69204b321
|
hook请求添加hook_index, 防止hook请求乱序 (#2758)
|
2023-08-13 20:46:08 +08:00 |
|
xia-chu
|
2bcbff09b0
|
web hook不再直接放行来自127.0.0.1播放鉴权请求
防止代理越过鉴权
|
2023-07-27 15:54:04 +08:00 |
|
xia-chu
|
c1f6517471
|
在开启on_http_access hook时，访问http文件(或目录)ip白名单机制不生效
on_http_access hook优先级更高，关闭on_http_access hook时才采用ip白名单机制，防止两种鉴权机制间的冲突
|
2023-07-27 15:54:03 +08:00 |
|
夏楚
|
25d5e410c3
|
禁止默认http api密钥，删除管理员越过鉴权逻辑 (#2655 #2690)
http api secret禁止使用默认的035c73f7-bb6b-4889-a715-d9eb2d1925cc
删除admin_params的设定
|
2023-07-22 17:30:20 +08:00 |
|
xia-chu
|
f55e13f9da
|
c sdk新增on_mk_media_send_rtp_stop事件回调
|
2023-07-08 22:34:09 +08:00 |
|
pedoc
|
2771bc15a5
|
添加on_server_exited webhook事件,当程序正常退出时触发 (#2591 #2585)
|
2023-06-28 11:36:41 +08:00 |
|
johzzy
|
03770ff409
|
Replace the tuple (vhost/app/stream) with MediaTuple. (#2560)
|
2023-06-17 10:28:01 +08:00 |
|
xia-chu
|
af0ebf4633
|
优化Parser代码命名
|
2023-06-10 14:55:40 +08:00 |
|
Johnny
|
0232caf068
|
add MediaTuple
|
2023-05-30 11:01:27 +08:00 |
|
xiongziliang
|
c8a20f85f6
|
直接打印SockException类
|
2023-04-23 00:10:18 +08:00 |
|
xia-chu
|
9443d68d6c
|
格式化代码
|
2023-04-18 10:33:22 +08:00 |
|
xiongguangjie
|
f949c6de2a
|
not retry when hook result code is int and !=0
|
2023-04-17 20:01:45 +08:00 |
|
xiongziliang
|
23f9a42f72
|
格式化与精简代码
|
2023-04-01 23:59:13 +08:00 |
|
ziyue
|
68948288e0
|
TcpSession/UdpSession统一为Session类
|
2022-11-19 09:33:10 +08:00 |
|
夏楚
|
a37268f003
|
格式化代码
|
2022-11-12 01:52:49 +00:00 |
|
xiongguangjie
|
bc63142712
|
add rtp server timeout hook
|
2022-11-10 16:58:02 +08:00 |
|
ziyue
|
7d251e15b3
|
on_publish hook兼容非标准回复
|
2022-10-20 11:00:19 +08:00 |
|
xiongziliang
|
12551be33c
|
提炼ProtocolOption赋值相关逻辑
|
2022-09-16 23:31:37 +08:00 |
|
huangxiuqi
|
258a4dd166
|
C API和WebHook未找到流回调添加直接关闭机制 (#1948)
|
2022-09-09 10:55:35 +08:00 |
|
PioLing
|
0948a3df31
|
支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930)
|
2022-09-03 09:54:09 +08:00 |
|
xiongziliang
|
6a4297845f
|
新增发送rtp被动关闭hook
|
2022-08-27 10:53:47 +08:00 |
|
Dw9
|
30984d2076
|
mp4录制支持作为观看者参与播放人数统计 (#1880)
|
2022-08-16 11:47:24 +08:00 |
|
ziyue
|
54f400a6e9
|
确保MediaServer主函数可以多次调用: #1838
|
2022-07-29 16:24:43 +08:00 |
|
xiongziliang
|
272eca1249
|
hook重试新增延时功能
|
2022-06-18 14:10:47 +08:00 |
|
Leon
|
01350c810e
|
update server/WebHook.cpp.
配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试，
|
2022-06-15 07:14:36 +00:00 |
|
xiongziliang
|
b23cbaa0f8
|
on_publish hook新增continue_push_ms参数，用于断连续推延时控制
|
2022-06-04 11:06:35 +08:00 |
|
xiongziliang
|
b0beea7781
|
修复笔误
|
2022-05-30 12:44:11 +08:00 |
|
xiongziliang
|
a11289e5f0
|
集群模式，溯源重试改成最大3次: #1663
|
2022-05-28 09:52:31 +08:00 |
|
xiongziliang
|
5e729d6153
|
溯源集群模式支持边沿服务器选择开启转hls: #1588
|
2022-04-23 18:40:20 +08:00 |
|
xiongziliang
|
8db01651fe
|
on_publish hook新增rtsp/rtmp/ts/fmp4转协议开关
|
2022-03-12 14:39:59 +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 |
|