amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 03:30:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,217 Commits 16 Branches 0 Tags 225 MiB
a33c1d5a08
Commit Graph

308 Commits

Author SHA1 Message Date
ljx0305
861be27ef8
Fix compilation error issues (#3412) 2024-03-26 15:05:14 +08:00
Jacob Su
208f57e2cd
Fix macOS compile error by rename version.h -> ZLMVersion.h (#3411 #3410) 2024-03-24 17:18:18 +08:00
xiongziliang
d8893877b2 Delete invalid code 2024-03-23 22:56:12 +08:00
johzzy
029813402d
feat: update negotiateSdp and WebRtcArgs (#3371) 
- update negotiateSdp
- update HttpAllArgs and alias
- update onRtcConfigure
- define setWebRtcArgs, handle set_webrtc_cands and setLocalIp

---------

Co-authored-by: xiongziliang <771730766@qq.com>
Co-authored-by: KkemChen <kkemchen@qq.com>
 2024-03-23 22:46:30 +08:00
KkemChen
2e2823d4cf
VideoStack: move sws execution to WorkThread and optimization interface (#3407) 
VideoStack: move sws execution to WorkThread and optimization interface
 2024-03-23 20:47:38 +08:00
xia-chu
cfac61e55b BugFix: prevent the player's configuration from being overridden in addStreamProxy 2024-03-22 20:50:07 +08:00
KkemChen
437ae778c0
feat: VideoStack (#3373) 2024-03-16 22:56:32 +08:00
xia-chu
69738ad24e BugFix: configuration of downloadRoot cannot use absolute paths 
Fix for http api `/index/api/downloadFile`
 2024-03-16 21:53:30 +08:00
johzzy
2f50344e7b
Add ServiceController to manage PlayerProxy/PusherProxy/FFmpegSource/RtpServer services (#3337) 2024-03-10 16:31:20 +08:00
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
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
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
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
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
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
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
xia-chu
6b9889a883 WebApi调试日志恢复为Debug级别 2023-07-02 12:45:07 +08:00
johzzy
03770ff409
Replace the tuple (vhost/app/stream) with MediaTuple. (#2560) 2023-06-17 10:28:01 +08:00
xia-chu
64b8079ac1 优化函数命名风格 
FindField改名为findSubString
 2023-06-10 14:55:40 +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