amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,243 Commits 16 Branches 0 Tags 225 MiB
58d273e04e
Commit Graph

4243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
li
58d273e04e add me to README 2024-05-06 17:54:30 +08:00
li
aa13b29470
Merge branch 'ZLMediaKit:master' into master 2024-05-06 17:02:32 +08:00
gongluck
64fdd78330
修复函数mk_rtc_send_datachannel声明、定义没对应的错误 (#3508) 2024-05-06 11:07:23 +08:00
yanggs
046aaa3498
修复拉取指定流时时长信息丢失的问题 (#3500) 2024-05-01 13:19:47 +08:00
夏楚
86348b86ee
Update README.md 2024-04-30 22:06:53 +08:00
xia-chu
664d0b67bc Add the listRtpSender http api 2024-04-21 11:31:43 +08:00
xia-chu
2d66dd7cb3 Fixing the problem of WebRTC handshake failure caused by unsupported RTP extensions (#3486) 2024-04-20 22:49:27 +08:00
xia-chu
e4de454d5d Charset default to UTF-8 on Windows 2024-04-20 22:25:21 +08:00
xia-chu
44d6457108 Update ZLToolKit, support kqueue for macOS/BSD 2024-04-20 21:15:47 +08:00
xia-chu
ff70ef233c Fix bug where ts files are not written into m3u8 file during HLS playback. 2024-04-20 20:00:25 +08:00
xiongguangjie
4aa330ab82
rtp g711 encoder rtp not key pos avoid gop cache useless (#3476) 
g711 rtp encoder input packet not key pos , avoid gop cache useless, fix
the bug
 2024-04-16 22:34:54 +08:00
renlu
c341f8ebf6 startSendRtp不指定use_ps时，发送的为裸包，不兼容之前的旧版本。 2024-04-14 11:35:31 +00:00
xiongguangjie
d8cb75d387
Improve url encode and decode code add user pass encode decode methond (#3468) 
去除url转义的冗余代码，添加用户名与密码的转义
 2024-04-13 20:36:15 +08:00
Aven
3dcd0ed463
Enable video stack individually (#3469) 2024-04-13 20:35:59 +08:00
Dw9
e6506a96d4
Update h264_pusher.c, fix build issue (#3444) 
修复win构建失败 strcasestr->strstr
 2024-04-08 10:16:45 +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
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