cqm
03526f141e
Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit into feature/transcode2
...
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
# Conflicts:
# conf/config.ini
# src/Codec/Transcode.cpp
# src/Common/MediaSource.h
# src/Common/MultiMediaSourceMuxer.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/macros.h
# webrtc/WebRtcPusher.cpp
# webrtc/WebRtcTransport.cpp
# webrtc/WebRtcTransport.h
2026-04-03 09:56:05 +08:00
xia-chu
a59809047c
修复编译警告
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2026-01-08 21:18:00 +08:00
xia-chu
021f09e62b
优化精简媒体事件相关逻辑代码
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-11-23 19:07:48 +08:00
xtxxtx
676000e355
修复ENABLE_WEBRTC、ENABLE_OPENSSL关闭时编译报错问题 ( #4501 )
...
修复：当ENABLE_WEBRTC=OFF且ENABLE_OPENSSL=OFF时，编译报错：找不到ssl.h
2025-10-18 12:11:37 +08:00
xia-chu
046bdecd1e
修复release编译产出文件过大的问题
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-10-11 18:58:10 +08:00
Lidaofu
be6f6a6690
fix: 修复c sdk 信令服务及ice服务未关闭问题 ( #4475 )
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-09-26 17:51:33 +08:00
Lidaofu
493714bc7d
c sdk 新增webrtc相关函数 ( #4473 )
...
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
另外调整函数位置，whip、whep请求设置Content-Type为application/sdp
2025-09-24 17:40:43 +08:00
xia-chu
c82dd75054
支持webrtc推流
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-09-22 21:06:17 +08:00
xia-chu
88b422db08
优化pauseRtpCheck接口，新增pause_seconds参数
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2025-09-09 23:11:48 +08:00
Lidaofu
90fcad41f2
feat: C Api 增加部分函数 ( #4382 )
...
feat: C Api
增加mk_recorder_start_task（录制任务）、mk_rtp_server_create3(rtp多路复用)、mk_rtp_server_update_ssrc（更新ssrc）、mk_rtp_get_info（获取rtp信息）、mk_rtp_pause_check（暂停RTP超时检查）、mk_rtp_resume_check（恢复RTP超时检查）、mk_media_source_set_speed（回放流速度配置）等函数
---------
Co-authored-by: lidaofu <lidf@ahtelit.com>
2025-08-09 10:45:16 +08:00
Lidaofu
94be50e50a
c sdk unix编译增加额外调试信息 ( #4364 )
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-07-26 15:45:00 +08:00
桑泽寰
e677e41502
新增ps解析器c api ( #4172 )
2025-02-28 12:49:47 +08:00
PioLing
9863f9c160
Add logo and version information to exe on windows ( #4093 )
2025-01-03 11:33:35 +08:00
cqm
06ba39a832
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into feature/transcode2
2024-12-02 18:12:57 +08:00
xia-chu
87b42ab492
优化代码
...
除1024改成右移10位
2024-11-29 23:51:34 +08:00
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
cqm
89e21038c2
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2
...
# Conflicts:
# src/Common/MediaSource.h
# src/Common/config.h
# src/Rtsp/RtspMediaSourceImp.h
# src/Rtsp/RtspMediaSourceMuxer.h
# src/Rtsp/RtspMuxer.cpp
# webrtc/WebRtcTransport.cpp
2024-09-22 11:40:39 +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
cqm
d329f76edf
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into transcode2
...
# Conflicts:
# src/Common/config.cpp
# src/Common/config.h
2024-08-19 18:03:03 +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
cqm
95f4576cf6
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2
2024-07-15 08:47:50 +08:00
cqm
2ffdfab71e
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2
...
# Conflicts:
# CMakeLists.txt
# conf/config.ini
# src/Common/MediaSink.cpp
# src/Common/MediaSink.h
# src/Common/MediaSource.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/config.cpp
# src/Common/config.h
# src/Extension/AAC.cpp
# src/Extension/AAC.h
# src/Rtsp/RtpCodec.h
# src/Rtsp/RtspMuxer.cpp
# src/Rtsp/RtspMuxer.h
# webrtc/Nack.cpp
# webrtc/WebRtcTransport.cpp
2024-07-15 08:47:30 +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
