THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,233 Commits 17 Branches 0 Tags 222 MiB
Commit Graph

4233 Commits

Author SHA1 Message Date
baiyfcu fc7ef34d8a
Merge 353c635852 into e6506a96d4 2024-04-08 10:16:55 +08:00
Dw9 e6506a96d4
Update h264_pusher.c, fix build issue (#3444) 
修复win构建失败 strcasestr->strstr
 2024-04-08 10:16:45 +08:00
baiyfcu 353c635852 对外暴露zlm生成目录 2024-04-07 14:08:50 +08:00
baiyfcu eab1dbc606 补提rtp app名称自定义相关文件修改 2024-04-07 14:08:05 +08:00
baiyfcu d771530316 添加rtp server支持自定义app名称 2024-04-07 13:59:57 +08:00
Dw9 edca662208
fix webrtc echo error (#3442) 
遵循着pr #3360 的修改方式解决webrtc echo模式失败的问题
 2024-04-05 22:11:50 +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
baiyfcu e7eae11891 rtsp点播恢复时不带range 2024-04-03 15:46:02 +08:00
baiyfcu 6b1b9f3e35 添加track在创建后input frame前回调，避免track订阅错过配置帧数据，MP4Demuxer接口添加virtual可派生扩展 2024-04-03 14:46:33 +08:00
baiyfcu 584944d777 屏蔽使用自定义WebSocketSessionBase创建http server时ws收数据崩溃问题（原因未定位） 2024-04-03 14:35:13 +08:00
baiyfcu e9887c6cd9 增加checkHost参数判断 2024-04-03 14:27:18 +08:00
baiyfcu 66b18bc7f8 添加非windows使用iconv转码 2024-04-03 14:26:15 +08:00
ljx0305 24689fefd1
Fix compilation error (#3432) 2024-04-01 17:31:04 +08:00
xia-chu af3ef996b0 Avoid build warnings in the main code 2024-03-30 14:59:28 +08:00
xia-chu 0602cc0c0b Add 'params' field to MediaSource tuple information 2024-03-30 14:46:39 +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
xia-chu ecc05dae28 BugFix: fix the issue where modifying the default secret resulted in HTTP api authentication failures 2024-03-30 14:04:32 +08:00
ljx0305 861be27ef8
Fix compilation error issues (#3412) 2024-03-26 15:05:14 +08:00
xiongziliang 3e13e69724 BufFix: avoid may change data in splitter 2024-03-24 22:01:56 +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 7aaafa18e7 Format code 2024-03-23 23:08:10 +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
xiongziliang d638754364 Update authors 2024-03-23 20:44:25 +08:00
xia-chu b05f515ccc Revert "Fix the issue of failing to push streams to FMS 3.0 server" 
This reverts commit 3b7f16b755.
 2024-03-22 20:50:07 +08:00
xia-chu f5ca61d235 Enhance compatibility with non-compliant RTMP AAC streams 2024-03-22 20:50:07 +08:00
xia-chu 49ddde28c0 Refactor code 2024-03-22 20:50:07 +08:00
xia-chu e972ec5a22 Remove deprecated code 2024-03-22 20:50:07 +08:00
xia-chu cfac61e55b BugFix: prevent the player's configuration from being overridden in addStreamProxy 2024-03-22 20:50:07 +08:00
xia-chu db4c570d19 WebRTC audio preferred PCMA 2024-03-22 20:50:07 +08:00
xia-chu 5036aa5ec5 BugFix: crashes when exceptions are thrown during destruction #3402 2024-03-22 20:50:07 +08:00
ljx0305 66a6253160
Fix compilation error issues (#3385) 2024-03-22 20:42:02 +08:00
xiongguangjie 12d9351666
Fix compile error for enable_webrtc is off ( #3393 #3397) 2024-03-22 20:41:14 +08:00
xia-chu 5a137f8b8e Update submodule 2024-03-17 10:28:10 +08:00
KkemChen 437ae778c0
feat: VideoStack (#3373) 2024-03-16 22:56:32 +08:00
百鸣 ff43fa5075
Fix the issue of abnormal timestamps during MP4 recording. (#3363) 
Co-authored-by: xingqiao <xingqiao@uni-ubi.com>
 2024-03-16 22:01:06 +08:00
haorui wang 3b7f16b755
Fix the issue of failing to push streams to FMS 3.0 server. (#3362) 
[how]
1. AMF 为简单类型时填插 AMF Null (参考 OBS 以及实际测试)
2. createStream 前附加 releaseStream 和 FCPublish, 兼容旧 FMS3.0
3. 正确处理 RTMP Header fmt 为 1 和 2 的业务逻辑
 2024-03-16 21:58:33 +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
xia-chu 50f65c4ba4 Random port pool ensures that both UDP and TCP modes are available simultaneously 2024-03-16 21:53:30 +08:00
xia-chu 1930d909f9 Fix the thread safety issue caused by poller thread switching when paced sender enabled 2024-03-16 21:53:30 +08:00
xiongguangjie c9c2706843 avoid addstreamproxy rtsp user or pass contain + 2024-03-16 21:52:24 +08:00
xiongguangjie af155ef87a no track throw error avoid addstreamproxy already exist 2024-03-16 21:52:24 +08:00
小强先生 8e16a698b6
降低webrtc握手未结束，数据先到的日志等级 (#3368) 2024-03-13 10:57:43 +08:00
johzzy 69800632fe
feat(html): update webrtc page (#3361) 
optimized webrtc page
 2024-03-13 10:48:17 +08:00
johzzy 1e39594335
fix for https://bugs.chromium.org/p/webrtc/issues/detail?id=15845 (#3360) 2024-03-10 21:34:03 +08:00
johzzy 2f50344e7b
Add ServiceController to manage PlayerProxy/PusherProxy/FFmpegSource/RtpServer services (#3337) 2024-03-10 16:31:20 +08:00
jamesZHANG500 03c93d0b23
Add config for save fmp4 record files (#3356) 2024-03-10 16:19:02 +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