amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-30 07:26:53 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,254 Commits 16 Branches 0 Tags 225 MiB
8b9a4092c2
Commit Graph

4254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xia-chu
9443d68d6c 格式化代码 2023-04-18 10:33:22 +08:00
xiongguangjie
43d7479c60 Merge branch 'master' into dev 2023-04-17 20:02:13 +08:00
xiongguangjie
f949c6de2a not retry when hook result code is int and !=0 2023-04-17 20:01:45 +08:00
夏楚
5eee86ade3
Update README.md 2023-04-17 18:09:59 +08:00
Dw9
978143c86d
rtp级联(ps/ts/es)新增支持gop缓存功能 (#2395) 
该修改主要解决rtp级联(调用startSendRtp接口)未做gop缓存导致上级无法秒开的问题。
同时通过RingBuffer对象线程隔离的特性，实现了在断连续推场景下归属线程切换导致的线程安全问题。
用户如未使用rtp级联功能，请修改配置文件关闭GOP缓存(rtp_proxy.gop_cache=0)以便节省内存。

---------

Co-authored-by: 夏楚 <771730766@qq.com>
 2023-04-17 12:19:24 +08:00
夏楚
6841ad3306
Update README.md 2023-04-14 23:07:09 +08:00
王成
3a6f660619
新增Assert异常类型，解决国标重复推流不注销问题 (#2393) 
Co-authored-by: wangcheng <wangcheng@xwmail.com>
Co-authored-by: xia-chu <771730766@qq.com>
 2023-04-14 15:10:48 +08:00
xiongziliang
24eaaf68fb 初步支持webrtc whip/whep(推拉流)协议 
whip推流地址: /index/api/whip?app=live&stream=test
whep拉流地址: /index/api/whep?app=live&stream=test
 2023-04-08 21:44:08 +08:00
xiongguangjie
c090fc3ea0 test_rtp avoid crash when exit 2023-04-07 23:34:41 +08:00
xiongguangjie
749ef33965 use poller input data avoid throw poll check 2023-04-07 23:09:10 +08:00
xiongguangjie
67d8837442 rtp h265 packet like h264 2023-04-06 19:54:59 +08:00
xiongguangjie
772fccba41 Merge branch 'master' into dev 2023-04-06 16:41:19 +08:00
夏楚
599208dd6a
修复全局变量构造先后顺序导致启动崩溃的问题 2023-04-06 16:16:28 +08:00
alexliyu7352
7fcd88d02a
避免hls拉流时m3u8文件出现问题或直播结束后,无限重试 (#2357) 
Co-authored-by: xiongziliang <771730766@qq.com>
 2023-04-05 20:36:44 +08:00
夏楚
21691e34e5
新增知识星球加入方式 2023-04-03 14:46:29 +08:00
明月惊鹊
fb5512bec7
webrtc页面新增获取在线流列表并直接点击播放功能 (#2359) 2023-04-03 10:03:04 +08:00
xiongziliang
744c1427e8 gcc/clang编译环境下c sdk api导出默认可见 2023-04-02 20:58:52 +08:00
xiongziliang
8a9d7fc5bf 更新作者列表 2023-04-02 00:07:28 +08:00
xiongziliang
23f9a42f72 格式化与精简代码 2023-04-01 23:59:13 +08:00
xiongziliang
384c8677ea startSendRtp接口在发送ps时支持只发送音频: #2217 2023-04-01 23:48:57 +08:00
xiongziliang
0a1c7cb9c9 更新第三方库 
更新media-server库修复解析特定ts文件内存溢出的bug:#2335
更新zltookit, 完善对异常ini配置的兼容，同时优化windows下管道模拟相关代码
 2023-04-01 23:25:42 +08:00
夏楚
8b97076372
完善issue模板，强制要求填写issue标题 2023-03-28 17:03:29 +08:00
xiongguangjie
11fa293a74 sync from master 2023-03-27 19:33:47 +08:00
xiongguangjie
514f81304a sync from rtc client js 2023-03-27 19:15:51 +08:00
xiongguangjie
5792af3dd5 fix direct_proxy is 0 repush not success 2023-03-25 20:40:40 +08:00
xiongguangjie
6383e25826 Merge branch 'master' into dev 2023-03-25 20:32:43 +08:00
xiongguangjie
a390042f38 srt push check audio and video timestamp sync 2023-03-25 20:32:21 +08:00
xiongguangjie
d611a18903 rtmp repush replace pre pusher 2023-03-25 00:03:22 +08:00
xiongguangjie
67d5ca0246 rtsp push replace pre pusher 2023-03-24 23:13:25 +08:00
ljx0305
ca7efd5941
修正ssrc轮回为0时，ssrc重复分配为1的bug(#2327) 2023-03-24 16:19:22 +08:00
xiongguangjie
876aea33f5 avoid fps too big 2023-03-23 18:14:28 +08:00
mtdxc
98ec6b68d9
HttpRequester支持失败重试功能(#2323) 2023-03-23 14:46:45 +08:00
xiongziliang
dfd37ff350 时间戳处理新增接口支持获取相对时间戳 2023-03-22 21:19:16 +08:00
xiongguangjie
e08bb73604
Merge pull request #2322 from Leonnash/master 
addStreamProxy /addStreamPushProxy retry_count参数支持0次重试（不重试），默认为-1，无限次重试
 2023-03-22 16:04:19 +08:00
Leonnash
cf342a6fdf
Update WebApi.cpp 2023-03-22 15:52:56 +08:00
baiyfcu
950f33bd3f 新增windows中_M_ARM64 _M_ARM _M_X64 CPU指定集识别 2023-03-17 02:04:00 +08:00
baiyfcu
a754a22680 修复在WINDOWS上cpu类型无法判断BUG 2023-03-17 01:31:56 +08:00
ljx0305
1dec350dcd
修正on_rtp_server_timeout hook时获取的端口非真实端口 (#2297) 
在调用openRtpServer接口时，如果传入的端口为0(随机端口)， 那么在触发on_rtp_server_timeout hook时的端口为0
 2023-03-15 14:54:18 +08:00
Derek Liu
6008ae157a
修复addFFmepgSource接口参数非法时无法清除记录表的bug (#2305) 
捕获addFFmepgSource接口参数dst_url解析错误的抛错,通过错误回调返回返回错误,清除s_ffmpegMap表中的无效KEY
 2023-03-14 19:38:24 +08:00
xia-chu
70ad9cb0b6 设置webrtc端口缺省配置为0(不开启) 2023-03-13 21:00:00 +08:00
TempoTian
5ae34d666e
提高 rtmp tcUrl 解析兼容性 (#2303 #2298) 2023-03-13 20:42:31 +08:00
xia-chu
b9fa5f9b5e 实例汇报时间改成60分钟一次 
同时新增程序启动日期、是否开启编译ffmpeg选项
 2023-03-13 20:29:18 +08:00
ahaooahaz
37cb29fa8e
increase sdp rel-addr length limit: #2330 #2302 2023-03-13 17:38:08 +08:00
xia-chu
96e1cf8146 优化cpu类型判断宏 2023-03-12 18:45:37 +08:00
xia-chu
46ba4894db 更新三方库 2023-03-12 18:13:27 +08:00
xia-chu
d818cad3c0 修复低版本gcc编译器lambda不支持可变长度模板参数捕获导致的编译问题:#2295 2023-03-12 09:39:49 +08:00
xia-chu
843e3423cf 新增实例上报功能: #2294 2023-03-12 00:14:22 +08:00
xia-chu
4617b6faa0 更新readme功能描述 2023-03-11 21:24:56 +08:00
mtdxc
15dc854e94
修复http multi form上传文件名相关bug(#2293) 2023-03-11 21:08:39 +08:00
xia-chu
44dde7a939 更新zltoolkit 2023-03-11 21:02:32 +08:00