mirror/ZLMediaKit
2
0
Fork 1
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-27 04:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,360 Commits 16 Branches 0 Tags 244 MiB
master
Commit Graph

281 Commits

Author SHA1 Message Date
Lidaofu
fdbf77d46d
feat: add mk_load_mp4_file c api(#3964) 
Co-authored-by: lidaofu <lidf@ahtelit.com>
Co-authored-by: xia-chu <771730766@qq.com>
 2024-10-18 21:48:42 +08:00
alex
4152dcd409
AI automatically translates all comments in the code into English (#3917) 2024-09-19 14:53:50 +08:00
Lidaofu
c409fc5754
确保start_send_rtp相关c api线程安全，同时新增多个接口支持指定配置参数 (#3838) 
修复被动tcp发送rtp问题 修改默认tcp send 5s超时设置 增加start_send更多参数配
 2024-08-22 21:12:06 +08:00
Weng, Qiang
4d8b000198
player_opencv.c中brg24变量的内存对齐 (#3800) 
在本地测试时发现，player_opencv.c程序如果不事先对brg24变量进行内存对齐，之后传入函数，运行到src/Codec/Transcode.cpp:FFmpegSws::inputFrame:sws_scale时可能会出现段错误
 2024-08-10 11:06:33 +08:00
u7ko4
e3cad7f8fa
支持绑定到指定网卡 (#3760) 2024-08-01 11:03:26 +08:00
xia-chu
81aef25583 整理startSendRtp相关接口，新增支持udp被动模式 
startSendPassive接口指定is_udp为1时则为开启udp被动模式, 被动模式下需要对方先发数据给zlmediakit，然后才能回复rtp数据；
同时在被动模式指定src_port时，不再等待对方连接成功后再返回(而是直接返回成功和端口号，失败通知请监听on_send_rtp_stopped hook)。
 2024-07-28 23:37:13 +08:00
xia-chu
3be77616e7 修复链接问题 2024-07-21 22:51:20 +08:00
xia-chu
9463d1291d 修复编译警告 2024-07-21 19:47:36 +08:00
xia-chu
6583e2869a 确保加载h264视频转流媒体时间戳精准 (#3691) 2024-07-21 19:21:23 +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
benshi
fb49515baa
添加从mk_parser循环获取所有header的接口 (#3692) 
add mk_api: 添加从mk_parser循环获取所有header的接口
 2024-07-05 20:56:23 +08:00
Lidaofu
5a717186dd feat: 增加拉流代理rtsp时提供倍速功能支持 (#3669) 
Co-authored-by: lidaofu <lidf@ahtelit.com>
 2024-06-28 16:08:08 +08:00
Lidaofu
ad7b28bb0a
补充mk_track、mk_media部分c api (#3628) 
Co-authored-by: lidaofu <lidf@ahtelit.com>
Co-authored-by: xiongziliang <771730766@qq.com>
 2024-06-15 15:55:39 +08:00
xiongziliang
b720ec7eff 新增mk_proxy_player_set_on_play_result代理失败回调接口 2024-06-09 18:47:20 +08:00
xiongziliang
77d2df1695 移除RtpSelector相关逻辑，优化代码结构 2024-06-09 10:52:10 +08:00
Lidaofu
49dfccd56f
补充C API拉流代理缺少retry_count重试次数配置 (#3584) 
Co-authored-by: 李道甫 <lidf@ahtelit.com>
 2024-05-30 10:49:05 +08:00
PioLing
0935da60a3
feat: Add on_mk_get_statistic_cb c api to obtain performance statistics data (#3549) 2024-05-19 10:30:29 +08:00
Lidaofu
18c5bb3670
添加C API on_record_ts 回调ts录像信息 (#3520) 
用时合并on_record_mp4相关接口

Co-authored-by: 李道甫 <lidf@ahtelit.com>
 2024-05-10 14:27:23 +08:00
xia-chu
8ac957f338 bugfix: Fix the memory overflow issue in H264Splitter 2024-05-09 18:06:19 +08:00
gongluck
64fdd78330
修复函数mk_rtc_send_datachannel声明、定义没对应的错误 (#3508) 2024-05-06 11:07:23 +08:00
Dw9
e6506a96d4
Update h264_pusher.c, fix build issue (#3444) 
修复win构建失败 strcasestr->strstr
 2024-04-08 10:16:45 +08:00
lidaofu-hub
071f008108
add c api for MediaSource (#3433) 
补充MediaSource C API  获取源地址 获取源类型  获取创建时间戳

---------

Co-authored-by: 李道甫 <lidf@ahtelit.com>
 2024-04-05 22:09:40 +08:00
xiongziliang
2159e90f78 Add demo of reading H.264 file and pushing RTSP/RTMP stream 2024-04-05 22:07:09 +08:00
xia-chu
af3ef996b0 Avoid build warnings in the main code 2024-03-30 14:59:28 +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
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
xiongguangjie
12d9351666
Fix compile error for enable_webrtc is off ( #3393 #3397) 2024-03-22 20:41:14 +08:00
johzzy
2f50344e7b
Add ServiceController to manage PlayerProxy/PusherProxy/FFmpegSource/RtpServer services (#3337) 2024-03-10 16:31:20 +08:00
gongluck
5a6364bae2
Add datachannel c apis and callbacks(#3328) 
增加datachannel数据收发的回调通知 #3326，和控制datachannel回显的开关

---------

Co-authored-by: xiongziliang <771730766@qq.com>
 2024-03-02 16:52:51 +08:00
lidaofu-hub
4d28b99780
Add mk_proxy_player_create2 for support more proxy options (#3262) 2024-02-04 23:15:11 +08:00
夏楚
bbe8f4a018
release 8.0 2023-12-09 16:23:51 +08:00
xiongziliang
f6b6fe04cd 新增mk_publish_auth_invoker_do2接口，支持精细化控制推流转协议设置 2023-11-12 21:24:02 +08:00
xia-chu
c83a3c5639 mk_media_source_broadcast_msg接口添加返回值 2023-09-02 13:06:42 +08:00
xia-chu
144165d537 新增mk_media_source_broadcast_msg接口 
通过该接口可以广播webrtc datachannel消息给webrtc播放器
 2023-09-02 12:58:20 +08:00
xia-chu
d286ac1d73 NoticeCenter支持安全类型转换，解决监听者参数类型不一致导致的bug 2023-09-02 11:22:28 +08:00
xia-chu
f55e13f9da c sdk新增on_mk_media_send_rtp_stop事件回调 2023-07-08 22:34:09 +08:00
xia-chu
e6a19c4ecc 修复c api录制相关接口线程安全问题 2023-07-08 22:12:56 +08:00
xiangshengjye
7c6b612a4d
c sdk新增mpeg-ps/ts打包接口 (#2620) 2023-07-06 14:11:21 +08:00
xia-chu
3259bac046 c sdk新增mk_frame_merger接口 2023-07-02 12:25:30 +08:00
朱如洪
c530f281c3
优化CMakeList, 完善iOS下编译配置 (#2578) 
1、调整 json 的源码引入，外部可以引入 json/json.h 使用；
2、针对 iOS 工程调整 cmake 配置，解决 iOS 环境下mk_util.h 找不到问题；同时在 iOS 工程中引入 MediaServer 静态库；
 2023-06-27 10:51:31 +08:00
johzzy
03770ff409
Replace the tuple (vhost/app/stream) with MediaTuple. (#2560) 2023-06-17 10:28:01 +08:00
tbago
c0a7a4ab70
优化cmake配置文件, 添加必要头文件 (#2558) 
- enable_server cmake选项生效;
- enable_tests 选项在api目录下的test同样生效;
- 增加stdio.h 防止编译失败;
 2023-06-17 10:24:17 +08:00
xia-chu
72ba87c803 修复mk_media_source_get_track接口崩溃问题:#2552 2023-06-17 09:14:51 +08:00
xia-chu
24fb666fb3 新增mk_media_source_get_track方法: #2530 2023-06-10 14:57:47 +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
xia-chu
936babf459 新增mk_media_source_find2接口 2023-05-25 16:57:03 +08:00
xia-chu
d4f8017117 修复mk_tcp_session_ref相关接口误导性注释 2023-05-24 10:50:49 +08:00