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

4254 Commits

Author SHA1 Message Date
Lidaofu a6e7d5b3a6
Merge branch 'ZLMediaKit:master' into master 2024-05-11 17:03:03 +08:00
xia-chu bbdbd6a3e0 feat: Using kBeatIntervalMS option for rtsp heartbeat interval time and add kRtspBeatType for setting rtsp heartbeat type 2024-05-11 14:41:18 +08:00
xiongguangjie 1c89950ebe
Fix record info size to int64 (#3527) 2024-05-11 10:49:33 +08:00
Lidaofu 1acd657171
Merge branch 'ZLMediaKit:master' into master 2024-05-10 15:19:11 +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
李道甫 cf0da3c383 feat: format code by mk_events.h 2024-05-10 11:35:15 +08:00
李道甫 9fbe725d8d feat: Supplement the definition of define 2024-05-09 21:27:13 +08:00
李道甫 6649488be7 feat: Change to mp4_info to record_inf 2024-05-09 21:02:07 +08:00
Lidaofu bccb3e26e6
Merge branch 'ZLMediaKit:master' into master 2024-05-09 20:36:50 +08:00
xia-chu 2eed284e61 feat: Close the connection after authentication failed in HTTP API 
Improve the safety of HTTP API
 2024-05-09 18:07:08 +08:00
xia-chu 8ac957f338 bugfix: Fix the memory overflow issue in H264Splitter 2024-05-09 18:06:19 +08:00
李道甫 0308f101ca add: C API on_record_ts callback 2024-05-08 18:34:16 +08:00
Lidaofu 4f72eef6ae
Merge branch 'ZLMediaKit:master' into master 2024-05-07 14:23:46 +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
lidaofu-hub bce6716a9b
Merge branch 'ZLMediaKit:master' into master 2024-04-10 17:17:16 +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
李道甫 4d57f413cf add: 补充MediaSource C API _strdup moved to api/include/mk_common.h 2024-04-02 08:55:26 +08:00
李道甫 5926160289 add: 补充MediaSource C API _strdup in linux 2024-04-01 18:34:09 +08:00
李道甫 5b850375ac add: 补充MediaSource C API extra useless white space 2024-04-01 18:20:46 +08:00
李道甫 9741eb7272 add: 补充MediaSource C API 2024-04-01 17:55:40 +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