amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 20:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,185 Commits 16 Branches 0 Tags 224 MiB
03c93d0b23
Commit Graph

506 Commits

Author SHA1 Message Date
huangcaichun
78a6f041a8
Fixed issue that set use_ps in startSendRtp api does not take effect (#3353) 
修复使用startSendRtp接口转发ps流，设置use_ps为1后，还发送es流的问题

---------

Co-authored-by: huangcaichun <cchuang@secusoft.cc>
 2024-03-10 16:17:29 +08:00
waken
79b2aa6adc
openRtpServer接口增加单视频参数，加快单视频流注册速度 (#3342) 
only_audio -> only_track
 2024-03-05 17:06:31 +08:00
夏楚
24ad9c9b9e
Support mpegts rtp payload in startSendRtp (#3335) 2024-03-02 16:53:53 +08:00
xiongguangjie
4fb593f4a1
Fix compilation failure issue caused by lack of regular expression support in gcc 4.8.5 (#3301 #3279) 2024-02-19 11:05:30 +08:00
waken
bfcaf15075
Ignore localhost address when get icecand for webrtc from http request (#3282) 2024-02-04 23:11:18 +08:00
sandro-qiang
ceae040a7a
Fix http url path and component's coding (#3237 #3181) 2024-01-28 19:18:36 +08:00
waken
fd1ebb1a51
Auto get icecand ip address from http request (#3251) 
Get ip address from http `Host` header, and set it to icecand ip for webrtc
 2024-01-26 10:26:30 +08:00
张传峰
9977b550e0
Add snapshot cmd parameter to ignore audio (#3246) 
Improve snapshot speed
 2024-01-26 10:19:19 +08:00
waken
3a80b1de1e
openRtpServer接口新增local_ip参数 (#3224) 
https://github.com/ZLMediaKit/ZLMediaKit/issues/3218

ipv4环境下，修改local_ip为0.0.0.0后可实现在openRtpServer后startSendRtp复用端口

仅测试windows服务端，sip与sip通话
 2024-01-18 10:59:09 +08:00
chdahuzi
a17b950b21
Install http api and hook before starting the service listener (#3149) 
We have found that sometimes, when starting zlmediakit, stream push requests may be received before the hook is ready.
 2023-12-20 19:32:49 +08:00
xiongziliang
f1923f0076 Ignore the http connection which calling kick_sessions http api 2023-12-17 18:19:18 +08:00
xia-chu
9ff4c09211 BugFix: fix webrtc bad weak ptr exception 2023-12-10 11:09:04 +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
Dw9
d21bdc35c9
修复addstreamproxy拉流瞬间超时的问题 (#3093) 2023-12-07 22:05:20 +08:00
xiongziliang
22732ea3f4 确保deleteRecordDirectory接口忽略正在录制的mp4文件 (#3032) 2023-12-02 21:53:25 +08:00
xiongziliang
c12a6f0aed 适配ZLToolKit 2023-12-02 19:49:28 +08:00
夏楚
76aebd74c6
整理MediaSource协议类型 2023-12-02 16:31:40 +08:00
夏楚
10c2197e76
新增downloadFile接口，支持下载限定目录下任意文件 (#3073) 2023-12-02 15:58:40 +08:00
xiongziliang
e1f199c986 deleteRecordDirectory接口忽略正在录制的mp4文件 (#3032) 2023-12-02 15:23:56 +08:00
xiongziliang
10663fd3b4 删除无效的hook api 2023-12-02 15:04:57 +08:00
xiongziliang
380887c5d3 http api回复改成英文 2023-12-02 15:02:00 +08:00
xiongziliang
a47c5d2ec0 http api不区分大小写 2023-12-02 14:56:59 +08:00
alexliyu7352
86029d08af
addStreamProxy支持透传参数并设置MediaPlayer (#3063) 
通过addStreamProxy接口可以直接配置MediaPlayer相关设置参数，比如说http代理url等
 2023-12-01 14:33:07 +08:00
夏楚
db0818c8d2
新增mp4点播接口loadMP4File (#3018 #2972) 2023-11-24 10:44:08 +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
waken
7f25138b46
openRtpServerMultiplex接口统一url路径 (#2963) 2023-11-09 20:36:51 +08:00
waken
6888f20d74
新增openRtpServerMultiplex接口，支持创建多路复用RTP服务器端口 (#2954) 
#2953
 2023-11-09 11:26:13 +08:00
Dw9
f8285a3f6c
startSendRtp接口新增支持同ssrc向多个服务器推流 (#2951) 
新增ssrc_multi_send参数，支持同ssrc向多个服务器推流，兼容当前startSendRtp/stopSendRtp接口
 2023-11-07 23:38:58 +08:00
xia-chu
d8d7fe9144 通过getMediaList接口可返回Track时间戳增量信息 2023-10-31 11:10:02 +08:00
xia-chu
c1b82961cf deleteRecordDirectory接口新增name参数，可以指定删除特定录像文件 2023-10-31 11:10:02 +08:00
ljx0305
7ee2d66eaa
统一代码命名风格 (#2910) 
openRtpServer时，如果开启tcp模式，从tcp端口池获取
 2023-10-19 17:55:30 +08:00
Armstrong
b8cb8957e4
修复WebApi退出清理时重复析构问题 (#2900) 
1. s_???Map.clear()会触发key/value的析构，先执行析构再移除map成员。析构执行完之前map成员仍然有可见性。
2. s_???Map的成员析构时，根据当前状态，可能触发回调，如播放终止回调。
3. 在状态变更的回调函数中，通过s_???Map.erase(key)的方式解注册，此时也会触发一次析构。

两次析构导致double free：a) map.erase, b) map.clear

Signed-off-by: ArmstrongCN <armstrong@sweelia.com>
 2023-10-13 15:26:31 +08:00
alexliyu7352
fdc00d5a02
增加jemalloc工具类, 增加jemalloc内存统计分析 (#2885) 
增加jemalloc工具类, 增加jemalloc内存统计分析
 2023-10-10 11:48:56 +08:00
xia-chu
585f7c3a3a 修复ffmpeg日志保存目录相关bug 
每次调用addFFmpegSource/getSnap接口时，都可能导致篡改全局配置变量
 2023-09-23 20:34:36 +08:00
xiongguangjie
f69f3b3029
docker 优雅关闭（docker stop graceful） (#2827) 2023-09-09 10:59:27 +08:00
xia-chu
e3e7495c90 新增webrtc播放器datachannel消息广播机制和接口 2023-09-02 12:53:56 +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
xia-chu
0844f09e24 addStreamProxy重复拉流时返回错误 (#2773) 2023-08-26 23:03:15 +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
aac8905619 api secret无效时不再直接退出程序 
而是修改为随机字符串并持久化至配置文件
 2023-08-12 15:43:30 +08:00
xia-chu
2bcbff09b0 web hook不再直接放行来自127.0.0.1播放鉴权请求 
防止代理越过鉴权
 2023-07-27 15:54:04 +08:00
xia-chu
2c8a46862b 来自127.0.0.1的http api请求开启secret校验 
防止http代理越过鉴权
 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
xia-chu
e81efec96e ip白名单机制只对需要secret校验的http api生效 2023-07-26 17:18:33 +08:00
xia-chu
706c63c64b 禁止通过setServerConfig接口修改ffmpeg.bin配置选项 2023-07-26 16:40:10 +08:00
xia-chu
098046cb1d 新增http api与http文件访问ip白名单限制机制，默认禁止公网访问 2023-07-26 16:33:21 +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