amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 12:13:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,937 Commits 16 Branches 0 Tags 224 MiB
2ad44bc773
Commit Graph

3937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BackT0TheFuture
e97e0d86bd
修复rtmp多层级url解析异常问题 (#2435) 
解析多层级rtmp url会丢失某些层级信息:  #2433
 2023-05-05 17:34:32 +08:00
xiongguangjie
ffed4b3bb2 format code style for pusher and player 2023-05-03 21:46:25 +08:00
xiongguangjie
7c89c1655f add getProxyPusherInfo and getProxyInfo restful api 2023-05-03 18:52:11 +08:00
Johnny
bfec1b1e0e fix typo 2023-05-02 20:41:13 +08:00
alexliyu7352
1dd0c69aa0
完善英文说明文档 (#2431) 2023-04-29 09:02:19 +08:00
alexliyu7352
9a9040ecda
Merge pull request #2428 from alexliyu7352/patch-56 
避免服务器端返回content-length=0时,TsPlayer不能正确释放的问题
 2023-04-28 23:46:22 +08:00
xia-chu
2708c85d57 修复编译问题 2023-04-28 23:08:59 +08:00
xia-chu
19c5323633 修复startSendRtp发送mp4文件时崩溃问题：#2429 2023-04-28 23:02:48 +08:00
xia-chu
beb99ee5b5 更新作者列表 2023-04-28 22:49:20 +08:00
xia-chu
ac46f5499e 修复编译错误: #2416 2023-04-28 22:44:57 +08:00
xia-chu
8c049d4e28 实现whip/whep delete相关功能 
通过whip/whep 回复http头中的Location url进行删除资源
新增delete token随机数实现删除鉴权
 2023-04-28 22:36:58 +08:00
xia-chu
d2349f01bd 使用static_pointer_cast优化性能 2023-04-28 22:04:38 +08:00
xia-chu
cdf97e7605 更新zltoolkit,适配最新代码 2023-04-28 22:04:09 +08:00
Alex
b3d4188fde 避免服务器端返回content-length=0时,TsPlayer不能正确释放的问题 2023-04-28 01:33:17 +08:00
xiongguangjie
64553797bd h265 rtp pack avoid 1387 size nal fu-a only one end packet and first satrt end not exist try fix #2425 2023-04-27 19:54:47 +08:00
xiongguangjie
a64383a26b sync media-server to fix #2409 2023-04-24 19:49:23 +08:00
lijin
38e05ab8cb
添加addStreamProxy对非法url异常捕获处理 (#2412) 
确保抛出异常时，原有代理拉流对象被正常移除，后续可以更新正确url
 2023-04-24 14:32:34 +08:00
xia-chu
a37b038af6 docker镜像默认开启trace日志 
同时暴露webrtc over tcp端口
 2023-04-23 14:37:05 +08:00
xia-chu
41451f6a93 修复不保存日志文件的bug 2023-04-23 14:30:41 +08:00
xiongziliang
81d0ba97a1 更新zltoolkit 
确保emitErr只触发一次onErr回调
 2023-04-23 00:21:35 +08:00
xiongziliang
c8a20f85f6 直接打印SockException类 2023-04-23 00:10:18 +08:00
xiongziliang
de8249592e Session类构造析构跟踪日志统一在底层网络框架打印 2023-04-22 23:58:17 +08:00
xiongziliang
f1037e3767 降低http api debug日志级别为Trace 2023-04-22 23:29:19 +08:00
xiongziliang
38ab3e0df4 添加cpu亲和性设置参数: #2407 
如果需要调用getSnap和addFFmpegSource接口，可以关闭cpu亲和性以发挥ffmpeg多核性能
 2023-04-22 22:10:35 +08:00
xiongziliang
967fe035ab 日志默认调整为debug级别 2023-04-22 22:03:30 +08:00
xiongziliang
7a95c87a29 优化代码 
空构造和析构函数替换为缺省
去除多余分号
 2023-04-22 21:59:26 +08:00
xiongziliang
e8a425945d 更新子模块 2023-04-21 23:14:53 +08:00
xiongziliang
b5a0a2e858 新增动态更新rtp server过滤ssrc接口updateRtpServerSSRC(#2390) 2023-04-21 23:08:48 +08:00
xiongziliang
c2b8f3e80e 更新zltoolkit,修复Session对象析构时获取ip端口失败的问题 2023-04-21 22:27:36 +08:00
xiongziliang
bb26fead1e rtmp协议metadata设置title字段 2023-04-21 22:25:06 +08:00
Johnny
ce16a0a9b6 Fix compile warnings 2023-04-21 21:12:42 +08:00
Johnny
82bc416546 add exchangeSdp 2023-04-21 20:40:37 +08:00
Johnny
5d33e4c9f9 refine: update static_cast in webrtc api 2023-04-21 20:24:23 +08:00
朱如洪
cb92cd0b89
修正 iOS 平台编译 Socket_ios.mm 文件找不到问题 (#2404) 
CMake Error at 3rdpart/CMakeLists.txt:188 (add_library):
  Cannot find source file:

    /Users/shinianzhiqian/Desktop/ZLMediaKit/3rdpart/ZLToolKit/Network/Socket_ios.mm

  Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .h
  .hh .h++ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc


CMake Error at 3rdpart/CMakeLists.txt:188 (add_library):
  No SOURCES given to target: zltoolkit
 2023-04-20 11:04:23 +08:00
xiongguangjie
30182701f5 fix vlc can't play mp4 of jpeg #2388 2023-04-19 19:40:58 +08:00
xia-chu
fcb0124f29 适配更新zltoolkit,优化增强网络库：#2397 2023-04-19 13:12:39 +08:00
xia-chu
f1438986ad 修复stopSendRtp后无法触发无人观看事件的问题 2023-04-18 10:54:49 +08:00
xia-chu
a93a985ae5 修复静态类型转换错误 2023-04-18 10:54:48 +08:00
xia-chu
2f075f60ea 修复编译警告，格式化代码 2023-04-18 10:38:12 +08:00
xia-chu
4bd3fdabfb clang-format列宽调整为160 2023-04-18 10:34:00 +08:00
xia-chu
9443d68d6c 格式化代码 2023-04-18 10:33:22 +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