amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 11:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,687 Commits 16 Branches 0 Tags 225 MiB
9498b96b95
Commit Graph

3687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wxf
b34226b785 spec: WebRTC requires openssl >= 1.1 2021-06-23 10:40:01 +08:00
wxf
549b07f598 spec: Enable WebRTC 2021-06-23 10:39:50 +08:00
wxf
f5786fcba3 兼容 glibc < 2.18 
* https://stackoverflow.com/a/8132440/5218590
* https://sourceware.org/bugzilla/show_bug.cgi?id=15366
 2021-06-23 10:39:08 +08:00
ziyue
e8c9666af0 支持hls直播文件延时删除: #913 2021-06-23 10:30:58 +08:00
xiongziliang
ce2122d3b6 优化rtmp chunk相关处理代码 2021-06-22 10:39:16 +08:00
ziyue
510d908bc4 rtp服务器支持opus推流 2021-06-21 20:32:13 +08:00
ziyue
c90f348801 RTP服务器支持ES混合流, 同时新增H265/G711的支持 2021-06-21 20:00:58 +08:00
ziyue
caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-21 17:51:15 +08:00
ziyue
8375064a90 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-21 17:50:05 +08:00
Xiaofeng Wang
25b2208f34
Merge pull request #921 from johzzy/johnny/dev 2021-06-20 09:10:08 +08:00
Johnny
89d8f005f8 fix: fix typo. 2021-06-20 01:46:24 +08:00
xiongguangjie
9b111fac62 add to do for h265 rtmp 2021-06-19 02:01:28 +08:00
xiongguangjie
d215502ff5 rtmp packet must has vlc when flush 2021-06-19 01:54:57 +08:00
xiongguangjie
a28aeb2148 for frame merge must has vlc(video codec layer) data and flush rtmp a frame must has vcl 2021-06-19 01:27:13 +08:00
夏楚
e3708e744e
Merge pull request #918 from ZLMediaKit/feature/fix-sdp-candidate-parse 
webrtc: 修正 sdp 中 candidate 解析问题
 2021-06-18 17:07:08 +08:00
夏楚
05c9a842a9 !10 对h264 一帧多slice （多nal）fmp4播放卡顿（vlc） 
Merge pull request !10 from xiongguangjie/dev
 2021-06-18 07:27:52 +00:00
xgj
2335043cdf drop SEI and AUD for h264 and h265 avoid sei as a frame 2021-06-18 15:19:21 +08:00
wxf
5fc5a9ef5f webrtc: 修正 sdp 中 candidate 解析问题 
见 https://datatracker.ietf.org/doc/html/rfc5245#section-15.1
> foundation = 1*32ice-char
 2021-06-18 13:36:25 +08:00
xgj
a6e9652da8 for h264/h265 judge a frame start more safe(h264 is first_mb_in_slice h265 is first_slice_segment_in_pic_flag) and for h265 only idr is key frame 2021-06-18 12:40:42 +08:00
xgj
3429690d75 for h264 pps sps aud sei not check first_mb_in_slice 2021-06-17 19:26:58 +08:00
xgj
1920802764 for h264 multi slice on frame compatibility 2021-06-17 18:08:35 +08:00
xgj
e0d162c460 Merge remote-tracking branch 'origin/dev' into dev 2021-06-17 16:15:51 +08:00
ziyue
f8467f21fb 推流失败时打印日志 2021-06-17 11:34:24 +08:00
ziyue
60a2346819 媒体源注销后不做无谓推流重试 2021-06-17 11:32:57 +08:00
ziyue
e4172b4ab1 更新postman api配置文件 2021-06-17 11:03:11 +08:00
ziyue
752590f804 完善addStreamPusherProxy相关功能并修复自动删除相关的bug 2021-06-17 11:01:14 +08:00
ziyue
aa39680c69 addStreamPusherProxy接口修改key唯一性规则,新增rtsp推流类型、超时参数 2021-06-17 10:41:26 +08:00
ziyue
eef0c31d7b addStreamProxy新增重试次数参数 2021-06-17 10:39:22 +08:00
ziyue
936c6f7965 调整代码细节 2021-06-17 10:12:34 +08:00
夏楚
06023f1770
Merge pull request #916 from ZLMediaKit/dev-monk 
添加推流代理器
 2021-06-17 09:52:49 +08:00
monktan
cd7ae27276 添加推流代理器 2021-06-16 19:40:08 +08:00
ziyue
fadef1cac3 完善添加track日志打印 2021-06-16 11:39:46 +08:00
ziyue
807f9626d5 webrtc新增对av1的支持 2021-06-16 11:14:10 +08:00
ziyue
a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
ziyue
d67060e97b mk_media_stop_send_rtp支持关闭单路流 2021-06-16 10:36:53 +08:00
ziyue
14d70426ed 加快GB28181推流时注册速度 2021-06-16 10:26:17 +08:00
ziyue
a09de23271 修复调用mk_media_stop_send_rtp函数导致崩溃的bug 2021-06-16 10:14:24 +08:00
ziyue
4d0db1b7c1 兼容时间戳不规范的H265流：#894 2021-06-15 12:55:55 +08:00
xgj
98d9dcd009 when link ssl with static library add ld link like this cmake .. -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR=/usr/local/ssl -DOPENSSL_USE_STATIC_LIBS=TRUE 2021-06-11 11:57:55 +08:00
xgj
5b8b5c0ed5 for ssl static link add ld library link 2021-06-11 11:04:43 +08:00
ziyue
24ab876fdb 修复重连时，创建多个mp4解复用器导致内存增长的bug:#895 2021-06-10 14:45:26 +08:00
ziyue
92f879d703 完善PlayerProxy关闭机制,重试次数超限后自动关闭 2021-06-09 15:01:45 +08:00
ziyue
ad2cd11eec 优化判断h265是否为关键帧的代码 2021-06-09 10:19:58 +08:00
baiyfcu
ca192a4286 H265 I帧多slice情况下导致花屏问题 
H265 I帧分片多包情况下，GPO缓冲只保存了I帧最后一个分片导致花屏
 2021-06-09 09:51:28 +08:00
ziyue
b0af056356 删除过多的日志 2021-06-08 21:06:14 +08:00
ziyue
55c2b08c57 rtsp播放器在udp情况下超时时间延长4倍(防止vlc超时) 2021-06-08 20:51:54 +08:00
ziyue
98dc9bc78e ssrc切换时间改为3秒:#899 2021-06-08 20:05:45 +08:00
ziyue
40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 17:52:44 +08:00
ziyue
6ccf512367 完善内存统计 2021-06-08 17:49:12 +08:00
ziyue
9c3ec4b4ed 更新zltoolkit,修复Windows下编译问题 2021-06-08 17:45:59 +08:00