amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,342 Commits 16 Branches 0 Tags 225 MiB
push_force_replace
Commit Graph

36 Commits

Author SHA1 Message Date
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
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
ljx0305
66a6253160
Fix compilation error issues (#3385) 2024-03-22 20:42:02 +08:00
waken
79b2aa6adc
openRtpServer接口增加单视频参数，加快单视频流注册速度 (#3342) 
only_audio -> only_track
 2024-03-05 17:06:31 +08:00
夏楚
bbe8f4a018
release 8.0 2023-12-09 16:23:51 +08:00
xiongziliang
380887c5d3 http api回复改成英文 2023-12-02 15:02:00 +08:00
alexliyu7352
86029d08af
addStreamProxy支持透传参数并设置MediaPlayer (#3063) 
通过addStreamProxy接口可以直接配置MediaPlayer相关设置参数，比如说http代理url等
 2023-12-01 14:33:07 +08:00
waken
6888f20d74
新增openRtpServerMultiplex接口，支持创建多路复用RTP服务器端口 (#2954) 
#2953
 2023-11-09 11:26:13 +08:00
xia-chu
2c8a46862b 来自127.0.0.1的http api请求开启secret校验 
防止http代理越过鉴权
 2023-07-27 15:54:04 +08:00
xia-chu
e81efec96e ip白名单机制只对需要secret校验的http api生效 2023-07-26 17:18:33 +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
ljx0305
7ef39d1b6f
修复openRtpServer函数声明不一致问题 (#2445) 2023-05-08 15:27:43 +08:00
ziyue
eac5a5b1dc 使用submodule方式添加jsoncpp源码 2022-10-16 21:10:18 +08:00
custompal
d853075175
RtpServer新增tcp主动模式支持 (#1938) 2022-09-09 10:56:28 +08:00
baiyfcu
fde6b436cc 封装rtp server创建和关闭 2022-06-22 10:31:53 +08:00
xiongziliang
4dc621e1bb 转协议选项抽象为ProtocolOption对象 2022-03-12 13:24:23 +08:00
夏楚
c72cf4cbcc
整理命名空间 (#1409) 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
 2022-02-02 20:34:50 +08:00
ziyue
be77f84315 支持溯源方式的集群模式 2022-01-12 16:48:14 +08:00
夏楚
878ce87329
支持线程内存malloc统计 (#1317) 2021-12-27 17:40:15 +08:00
xiongziliang
10afab77f3 Merge branch 'feature/keep_alive_monk' of https://gitee.com/xia-chu/ZLMediaKit 2021-08-21 19:11:20 +08:00
ziyue
1b4f5313f2 修复异步http api相关bug 2021-08-18 20:37:10 +08:00
ziyue
4dbe0a1d3e 合并pr：#1025 2021-08-12 20:37:46 +08:00
baiyfcu
0ed902509a player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件 2021-08-09 18:28:43 +08:00
xia-chu
38894097ae Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-09 10:47:14 +08:00
xia-chu
67e1b1f194 媒体注册hook添加编码等信息 2021-04-08 17:34:46 +08:00
ziyue
7e5cb33395 开始对接js 2021-03-31 17:15:26 +08:00
xia-chu
b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
f9f9cde2b4 整理webapi、webhook框架代码 2020-12-27 22:14:59 +08:00
xiongziliang
7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang
35c4c05e7b 修复setServerConfig接口保存配置文件相关bug 2019-11-04 09:21:11 +08:00
xiongziliang
7c7b9e560e 统一添加bom 2019-08-08 19:01:45 +08:00
xiongziliang
bff1f2f8f6 函数声明放置于头文件 2019-06-24 14:58:56 +08:00
xiongziliang
e1e50191fb 配置键名统一使用string 2019-06-19 10:32:54 +08:00
xiongziliang
4bd6b24c30 添加协议头 2019-06-11 09:25:54 +08:00
xiongziliang
c503749328 添加FFmpeg拉流功能 2019-06-06 18:28:33 +08:00