ziyue
|
143979f354
|
Stamp: 兼容时间戳跳跃的情况
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
fdfde17ec7
|
Demuxer/Player: 修改解复用与播放器底层逻辑,确保触发播放成功回调时不丢帧
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
37fdb8d135
|
MediaSource: 继承改成私有
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
ded5d83e04
|
MediaSink: 静音音频确保最后添加
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
dad0c5e3cc
|
MediaPusher: 抽象精简代码
|
2021-11-09 17:49:18 +08:00 |
|
ziyue
|
b96a2291eb
|
MediaPusher: 整理代码风格
|
2021-11-09 15:45:31 +08:00 |
|
ziyue
|
b42072405e
|
忽略某些流声明存在却没实质数据的track
|
2021-10-28 10:53:07 +08:00 |
|
ziyue
|
5d56e86cfd
|
修复Windows上strptime不存在编译失败的问题
|
2021-10-27 17:14:16 +08:00 |
|
ziyue
|
e249a03dc2
|
修复调用stopSendRtp接口无法触发无人观看事件的bug:#1189
|
2021-10-27 13:40:59 +08:00 |
|
ziyue
|
350a0e3f81
|
防止内存越界
|
2021-10-27 13:26:53 +08:00 |
|
ziyue
|
0a3bcdab15
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
|
2021-10-27 13:24:28 +08:00 |
|
ziyue
|
b438ecb88c
|
兼容不规范的aac rtsp推流
|
2021-10-27 13:23:27 +08:00 |
|
Dw9
|
bb9695a247
|
解决win32下大文件点播不了问题 (#1188)
|
2021-10-26 20:35:55 +08:00 |
|
ziyue
|
cd52a022f4
|
修复rtsp点播时长不准的bug
|
2021-10-25 19:39:45 +08:00 |
|
ziyue
|
fcfa13b0fe
|
适配最新zltoolkit
|
2021-10-22 16:43:34 +08:00 |
|
夏楚
|
19ebb03458
|
media-server使用原仓库并适配 (#1180)
* remote media-server
* 适配第三方库media-server使用原仓库
* ireader/media-server库使用gitee镜像
Co-authored-by: monktan <monktan@tencent.com>
|
2021-10-22 14:16:39 +08:00 |
|
ziyue
|
4067f2beb6
|
ps rtp推流接口(startSendRtp)支持推送本地mp4录像
|
2021-10-21 10:21:52 +08:00 |
|
ziyue
|
a25e1d6021
|
解决获取mp4录像文件大小不准的问题:#1173
|
2021-10-20 18:14:20 +08:00 |
|
ziyue
|
b4327b9b18
|
获取文件大小功能移至zltoolkit
|
2021-10-20 18:09:37 +08:00 |
|
ziyue
|
0e0608dc27
|
兼容dts时间戳回退导致录像切片异常的问题
|
2021-10-20 17:38:11 +08:00 |
|
ziyue
|
2422285829
|
修改mp4录制相关代码风格
|
2021-10-20 17:37:19 +08:00 |
|
ziyue
|
93c6754fc4
|
兼容一些不规范的rtsp流
|
2021-10-20 11:54:05 +08:00 |
|
ziyue
|
cf1adf1c92
|
兼容一些不规范的rtsp流
|
2021-10-20 10:58:05 +08:00 |
|
ziyue
|
8aa2d0ce07
|
add RTC_SCHEMA macros
|
2021-10-19 15:22:48 +08:00 |
|
ziyue
|
74aa2ba07f
|
修复GB28181推流显示设备端口错误的问题:#1160
|
2021-10-16 17:32:20 +08:00 |
|
ziyue
|
488026c0b8
|
删除多余代码
|
2021-10-16 16:58:13 +08:00 |
|
ziyue
|
f5f58196b5
|
修改常量命名
|
2021-10-16 16:58:03 +08:00 |
|
ziyue
|
8769ea83a9
|
修复关闭hls相关功能时编译报错问题
|
2021-10-16 16:56:59 +08:00 |
|
ziyue
|
b10fc52384
|
CHECK宏支持自定义错误提示
|
2021-10-16 16:24:40 +08:00 |
|
Johnny
|
722097be05
|
调整 RtspSession::_push_src类型,统一为 RtspMediaSource::Ptr _push_src;
|
2021-10-15 18:25:06 +08:00 |
|
ziyue
|
a408197493
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
|
2021-10-15 14:12:41 +08:00 |
|
Xiaofeng Wang
|
fe450ba2cb
|
支持生成 sdp 时指定端口 (#1161)
|
2021-10-15 14:10:04 +08:00 |
|
Xiaofeng Wang
|
2a2597a874
|
初始化内存 (#1162)
|
2021-10-15 14:09:32 +08:00 |
|
ziyue
|
702c505a17
|
合并pr:#1158
|
2021-10-15 11:21:10 +08:00 |
|
Johnny
|
22c68a297e
|
调整 RtcpContext 成员函数
|
2021-10-15 11:21:10 +08:00 |
|
Johnny
|
f64129177e
|
调整 RtcpContext 成员变量
|
2021-10-15 11:21:10 +08:00 |
|
Johnny
|
c98e85caec
|
增加 RtcpContextForSend/RtcpContextForRecv作为RtcpContext子类
|
2021-10-15 11:21:10 +08:00 |
|
ziyue
|
76ae292ae7
|
防呆设计
|
2021-10-13 20:56:22 +08:00 |
|
ziyue
|
dd81497e5c
|
修复rtp pts 时间戳回退导致ntp时间戳计算异常的bug:#1152
|
2021-10-13 15:52:12 +08:00 |
|
xiongziliang
|
ea1fa03f13
|
修复twcc fci生成相关bug
|
2021-10-07 15:39:02 +08:00 |
|
xiongziliang
|
0ae1d46892
|
基本完成twcc rtcp fci的生成
|
2021-10-07 12:28:59 +08:00 |
|
xiongziliang
|
e02bc9ce67
|
修复twcc StatusVecChunk生成相关bug
|
2021-10-07 12:26:16 +08:00 |
|
xiongziliang
|
dbc377a1f9
|
初步添加twcc rtcp发送逻辑
|
2021-10-06 22:42:17 +08:00 |
|
ziyue
|
15edbeac3e
|
整理http相关代码
|
2021-09-30 16:10:09 +08:00 |
|
夏楚
|
a548fcd709
|
Feature/dev (#1143)
* 防止每次cmake后导致重复编译
|
2021-09-30 11:27:42 +08:00 |
|
haorui wang
|
adc6f652bd
|
修复zlm推流FMS,修正zlm的RTMP协议 (#1140)
* 修复zlm推流FMS,修正zlm的RTMP协议
Co-authored-by: 夏楚 <771730766@qq.com>
|
2021-09-29 16:57:19 +08:00 |
|
xiongziliang
|
4ff206fa42
|
兼容一些不规范的rtsp sdp: #1128
|
2021-09-29 01:16:52 +08:00 |
|
xiongziliang
|
892e151063
|
响应http head命令后不关闭socket:#1136
|
2021-09-29 00:46:09 +08:00 |
|
xiongziliang
|
8d2d1e135c
|
修改rtsp点播ntp时间戳
|
2021-09-29 00:25:34 +08:00 |
|
xiongziliang
|
b1666eb651
|
实现媒体源pause/speed接口:#1129
|
2021-09-29 00:16:56 +08:00 |
|
xiongziliang
|
507eadf20b
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit
|
2021-09-28 22:49:59 +08:00 |
|
xiongziliang
|
7d1b2583e6
|
优化代码
|
2021-09-28 22:44:02 +08:00 |
|
xiongziliang
|
305d9bc259
|
完善twcc rtcp包相关代码
|
2021-09-28 22:44:02 +08:00 |
|
ziyue
|
3bc0769ccb
|
完善mk_media接口
|
2021-09-27 14:34:26 +08:00 |
|
ziyue
|
c493f0da1b
|
完善添加静音音频相关功能
|
2021-09-27 14:12:11 +08:00 |
|
ziyue
|
e20718fbde
|
确保静音音频track不影响后续添加的正常音频track
|
2021-09-27 13:27:07 +08:00 |
|
ziyue
|
afec4b62b9
|
全局自动添加静音音频
|
2021-09-27 13:20:34 +08:00 |
|
ziyue
|
e9008afca0
|
addTrack/inputFrame接口支持返回值;新增全局添加静音音频接口
|
2021-09-27 13:12:53 +08:00 |
|
hejilin
|
dcb775c6e8
|
去除非第三方库的编译告警
|
2021-09-16 16:00:46 +08:00 |
|
ziyue
|
3034f19a66
|
完善http直播url解析逻辑
|
2021-09-15 15:31:00 +08:00 |
|
ziyue
|
83ee396405
|
全局关闭音频时,加快单视频流注册速度
|
2021-09-14 16:27:11 +08:00 |
|
zqsong
|
23ae6911ab
|
Update GB28181Process.cpp
修复ENABLE_MP4 false时编译报错
|
2021-09-04 09:38:23 +08:00 |
|
夏楚
|
ad1ae2ac66
|
修复ntp时间戳计算精度导致的bug:#1086
|
2021-09-04 09:28:41 +08:00 |
|
ziyue
|
c2bf2928d0
|
完善key-value解析代码
|
2021-09-03 18:11:20 +08:00 |
|
ziyue
|
246f446142
|
确保http请求合法
|
2021-09-03 18:02:31 +08:00 |
|
ziyue
|
5f2e4ff2c0
|
修复http文件目录相关bug:#1083
|
2021-09-03 17:58:23 +08:00 |
|
ziyue
|
415bc95dda
|
完善ntp时间戳计算逻辑
|
2021-09-02 21:39:10 +08:00 |
|
ziyue
|
186c15364a
|
精简Frame对象实例化相关代码
|
2021-09-02 10:56:21 +08:00 |
|
ziyue
|
57e91054af
|
合并日志相关pr: #1077
|
2021-08-30 20:47:11 +08:00 |
|
kevin cheng
|
7d456a0513
|
Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit
|
2021-08-30 19:04:50 +08:00 |
|
kevin cheng
|
5bd169e6de
|
新增C API 广播日志到上层应用
|
2021-08-30 19:03:20 +08:00 |
|
ziyue
|
b9a699588e
|
Merge remote-tracking branch 'origin/master'
|
2021-08-30 18:05:46 +08:00 |
|
ziyue
|
04bf829540
|
非rtsp协议减少一帧延时
|
2021-08-30 18:05:21 +08:00 |
|
xiongziliang
|
d2f02c0a0c
|
修复rtsp sdp解析的bug
|
2021-08-28 13:02:53 +08:00 |
|
ziyue
|
2242577661
|
优化解析复杂数据结构配置项时的性能
|
2021-08-27 11:11:05 +08:00 |
|
ziyue
|
848774271f
|
合并并完善http虚拟目录相关代码
|
2021-08-26 19:50:19 +08:00 |
|
ziyue
|
03e9c09c42
|
修复FullUrl()未url转义导致的bug
|
2021-08-26 19:10:04 +08:00 |
|
baiyfcu
|
626bf3dcf9
|
添加http文件服务可挂载物理目录,新增ENABLE_API_STATIC_LIB
sa
|
2021-08-25 14:30:31 +08:00 |
|
ziyue
|
bb63273c73
|
计算dts逻辑兼容一些奇怪的rtsp流:#1031
|
2021-08-23 21:48:30 +08:00 |
|
ziyue
|
07c5341fb0
|
兼容一些奇怪的rtsp流:#1031
|
2021-08-23 21:29:23 +08:00 |
|
ziyue
|
b3ad0891e6
|
修复除0的bug
|
2021-08-22 15:13:20 +08:00 |
|
xiongziliang
|
41c09757a7
|
解决GB28181推流无ntp时间戳导致的问题
|
2021-08-21 18:52:52 +08:00 |
|
ziyue
|
94a6dc66c9
|
修复生成rtmp包时间戳错误的问题
|
2021-08-19 19:52:55 +08:00 |
|
ziyue
|
1cddc2227b
|
修复h265关键帧判断逻辑bug
|
2021-08-18 22:26:24 +08:00 |
|
ziyue
|
821b0e4bb6
|
兼容最后一帧时间戳等于sps pps时间戳的的异常流
|
2021-08-18 22:19:36 +08:00 |
|
ziyue
|
10522e4ea5
|
完善getOriginUrl接口
|
2021-08-16 17:31:13 +08:00 |
|
baiyfcu
|
b8aabb5eab
|
Merge branch 'master' into master
|
2021-08-13 16:14:49 +08:00 |
|
ziyue
|
8fd9853bc9
|
完善http断开时日志
|
2021-08-13 10:59:13 +08:00 |
|
ziyue
|
ec9b8c6471
|
降低http链接断开日志级别
|
2021-08-13 10:57:04 +08:00 |
|
ziyue
|
0f6d1135eb
|
优化http调试日志性能
|
2021-08-12 21:29:02 +08:00 |
|
ziyue
|
7b60f8b093
|
优化完善代码
|
2021-08-12 20:55:11 +08:00 |
|
ziyue
|
4dbe0a1d3e
|
合并pr:#1025
|
2021-08-12 20:37:46 +08:00 |
|
ziyue
|
30b139eaf0
|
Merge branch 'feature_bafc' of https://github.com/xia-chu/ZLMediaKit
|
2021-08-12 11:18:34 +08:00 |
|
ziyue
|
e3d519dde6
|
无人观看自动关闭流时才打印日志
|
2021-08-12 10:54:57 +08:00 |
|
ziyue
|
094f7553c9
|
合并pr(rtp最大大小可配置):#1028
|
2021-08-12 10:44:12 +08:00 |
|
monktan
|
7ed7e5386c
|
rtp包最大大小可配置
|
2021-08-11 15:48:15 +08:00 |
|
baiyfcu
|
0ed902509a
|
player增加speed,pause扩展,seek支持秒级定位,MP4按时间戳生成文件
|
2021-08-09 18:28:43 +08:00 |
|
ziyue
|
9e5d325e43
|
Merge remote-tracking branch 'origin/master'
|
2021-08-05 14:52:05 +08:00 |
|
ziyue
|
018fa40946
|
打印codec信息时,打印url信息
|
2021-08-05 14:49:52 +08:00 |
|
wxf
|
e03d15053d
|
调整结构, 清理关系, 取消继承 MP4FileDisk, 改为成员
Fix #1018
|
2021-08-03 21:48:19 +08:00 |
|
ziyue
|
91f370e925
|
新增remainData接口
|
2021-08-02 15:53:26 +08:00 |
|
ziyue
|
6df0ee69e0
|
修复rtsp aac config兼容性bug: #1011
|
2021-07-30 16:52:13 +08:00 |
|
ziyue
|
375d36b4c8
|
确保rtp丢包时,丢弃gop后续所有帧,防止丢包花屏
|
2021-07-29 16:22:43 +08:00 |
|
ziyue
|
55fc598d4c
|
修复nack fci相关bug
|
2021-07-28 12:20:16 +08:00 |
|
ziyue
|
c59a7a04c3
|
nack/rtx支持多次重传,提高抗丢包率
|
2021-07-27 20:42:25 +08:00 |
|
ziyue
|
3840ff2a3f
|
修复rtt计算逻辑
|
2021-07-27 10:50:34 +08:00 |
|
ziyue
|
10eb063f63
|
rtp时间戳采用pts
|
2021-07-27 10:16:35 +08:00 |
|
ziyue
|
42ef41cb58
|
修复rtp时间戳映射机制相关bug: #998
|
2021-07-22 20:31:02 +08:00 |
|
ziyue
|
58d5026191
|
websocket客户端添加获取http连接的接口,方便设置http请求头
|
2021-07-22 15:48:10 +08:00 |
|
ziyue
|
0e27704859
|
修复编译问题
|
2021-07-22 14:59:23 +08:00 |
|
ziyue
|
566a49e227
|
修复getMediaTracks接口相关功能
|
2021-07-20 13:15:57 +08:00 |
|
ziyue
|
46722546a6
|
Merge remote-tracking branch 'origin/master'
|
2021-07-20 12:43:28 +08:00 |
|
ziyue
|
4b34e58d3c
|
移除MultiMuxerPrivate对象,修复rtp发送时无sps pps帧的问题
|
2021-07-20 12:42:53 +08:00 |
|
ziyue
|
902c25ae67
|
删除无效代码
|
2021-07-20 12:42:53 +08:00 |
|
lawrencehj
|
b6ce03b64f
|
解决Windows下编译出错问题
|
2021-07-19 10:31:24 +08:00 |
|
夏楚
|
f47e1ecd31
|
Merge pull request #993 from ZLMediaKit/feature/update-splitter-usage
Http/HttpRequestSplitter: 添加使用注意事项
|
2021-07-18 20:11:59 +08:00 |
|
xiongziliang
|
49f59fb993
|
Merge branch 'feature/ps-decoder-cache-buffer' of https://github.com/xia-chu/ZLMediaKit
|
2021-07-18 19:43:12 +08:00 |
|
夏楚
|
6dbad3fb59
|
Merge pull request #992 from ZLMediaKit/feature/ignore-hik-ps-0xbd
忽略海康 PS 流中的 0xBD 包
|
2021-07-18 19:40:38 +08:00 |
|
wxf
|
f0c5633bfb
|
Http/HttpRequestSplitter: 添加使用注意事项
|
2021-07-18 17:36:46 +08:00 |
|
wxf
|
2f82c89278
|
忽略海康 PS 流中的 0xBD 包
|
2021-07-18 17:31:27 +08:00 |
|
wxf
|
9dd602c242
|
GB28181Process: 不再需要缓存未处理完的 PS/TS 帧
* PS 帧已由 PSDecoder 缓存;
* TS 帧在 TSDecoder 中有判断是否为 TS, 即使出错缓存也无意义;
|
2021-07-18 15:08:49 +08:00 |
|
wxf
|
5172b846d3
|
PSDecoder: 缓存未处理完的数据
|
2021-07-18 15:08:44 +08:00 |
|
wxf
|
b891fc5654
|
_rtp_sort_cache_map -> _pkt_sort_cache_map, 不依赖于 RTP
|
2021-07-17 20:00:09 +08:00 |
|
wxf
|
ac01dc97af
|
修正对非 uint16_t 序号的支持
|
2021-07-17 20:00:02 +08:00 |
|
ziyue
|
892b2d2ef9
|
修复对象同名导致的bug
|
2021-07-16 15:58:01 +08:00 |
|
ziyue
|
8548753c28
|
修正SDES rtcp对象命名
|
2021-07-15 17:38:04 +08:00 |
|
ziyue
|
c25da5a222
|
修复H265 vlc帧判断逻辑bug
|
2021-07-15 17:36:44 +08:00 |
|
ziyue
|
8d5f29d94c
|
Merge branch 'feature/find-async-by-session' of https://github.com/xia-chu/ZLMediaKit
|
2021-07-15 11:50:10 +08:00 |
|
ziyue
|
c8f00cefa0
|
完善获取flv是否包含音视频相关逻辑
|
2021-07-15 11:29:21 +08:00 |
|
wxf
|
ece7186e6c
|
改为按 Session 查找媒体源以支持 TCP/UDP Session
|
2021-07-15 11:25:48 +08:00 |
|
ziyue
|
fe42ea30fc
|
整理flv复用器
|
2021-07-15 11:16:11 +08:00 |
|
ziyue
|
b12bd6e7ff
|
格式化代码
|
2021-07-14 21:41:26 +08:00 |
|
ziyue
|
09d7670fdf
|
收到sender report包前,通过系统时间戳产生ntp时间戳
|
2021-07-14 21:41:13 +08:00 |
|
ziyue
|
6ddd420f1c
|
修复webrtc rtx包计入receiver report统计导致simulcast推流失效的问题
|
2021-07-14 21:40:08 +08:00 |
|
ziyue
|
6bc39058ab
|
加大时间戳跳变容忍度,防止网络抖动时导致音视频不同步
|
2021-07-13 17:30:54 +08:00 |
|
ziyue
|
77283f3973
|
优化ntp时间戳获取性能
|
2021-07-13 10:10:23 +08:00 |
|
ziyue
|
1cf79e886b
|
新增rtp时间戳大幅跳跃处理逻辑
|
2021-07-12 21:47:56 +08:00 |
|
ziyue
|
298f6e3864
|
rtp使用ntp时间戳作为时间戳,用于实现rtsp音视频同步
|
2021-07-12 21:18:22 +08:00 |
|
yangkun
|
03f6f4c4c0
|
fix publish type
|
2021-07-09 14:58:58 +08:00 |
|
ziyue
|
9217a5dbcd
|
精简代码
|
2021-07-09 14:04:34 +08:00 |
|
ziyue
|
4b0d0efdfb
|
修复笔误
|
2021-07-09 14:02:25 +08:00 |
|
ziyue
|
35d9321b93
|
整理H264/H265 Frame对象及相关代码
|
2021-07-09 13:38:20 +08:00 |
|
ziyue
|
4fb4471647
|
修复265 rtmp/flv相关bug:#965
|
2021-07-08 17:09:42 +08:00 |
|
ziyue
|
4b694ccde8
|
http-ts直播减少一次内存拷贝
|
2021-07-07 16:17:56 +08:00 |
|
ziyue
|
039be5444e
|
修复m3u8中extinf不准的问题:#816
|
2021-07-07 11:53:01 +08:00 |
|
ziyue
|
03addaf0b7
|
由于frame merge时已经过滤无效帧,所以移除多余代码
|
2021-07-07 11:37:22 +08:00 |
|
ziyue
|
59131e3b0a
|
修复ts/ps解析后组帧逻辑bug:#964
|
2021-07-07 11:02:36 +08:00 |
|
xiongziliang
|
9f9b3a5a64
|
提高http-ts直播性能:#961
|
2021-07-06 23:57:39 +08:00 |
|
xiongziliang
|
c393cc7c0e
|
修复GB28181粘帧导致花屏的问题: #964,#954
|
2021-07-06 23:37:04 +08:00 |
|
xiongziliang
|
986e9511a2
|
完善rtt相关代码
|
2021-07-06 23:09:56 +08:00 |
|
ziyue
|
4c296488f1
|
修复rtcp rr/sr时间戳转换相关问题,计算rtt
|
2021-07-06 21:48:51 +08:00 |
|
ziyue
|
1485be266a
|
查找MediaSource时,app与stream id不能为空
|
2021-07-01 10:56:59 +08:00 |
|
xiongziliang
|
09fa6b7aae
|
精简代码
|
2021-06-30 23:35:19 +08:00 |
|
xiongziliang
|
c470016316
|
优化MediaSource遍历性能
|
2021-06-30 23:03:27 +08:00 |
|
ziyue
|
69c3b24d06
|
优化遍历MediaSource接口性能
|
2021-06-30 21:24:16 +08:00 |
|
ziyue
|
66f28f52b4
|
添加Ptr定义
|
2021-06-29 17:42:32 +08:00 |
|
ziyue
|
df377fc1f4
|
修改宏定义,防止频繁重新全量编译
|
2021-06-29 17:41:56 +08:00 |
|
ziyue
|
3165a2f81c
|
修改服务器版本信息声明相关代码
|
2021-06-29 11:16:05 +08:00 |
|
ziyue
|
dfbfd65ab3
|
宏定义移至macros.h文件
|
2021-06-28 20:29:56 +08:00 |
|
ziyue
|
de5cf86050
|
http最大请求加大到40 KB
|
2021-06-28 20:12:35 +08:00 |
|
ziyue
|
397c1c7c57
|
整理宏
|
2021-06-28 20:12:07 +08:00 |
|
ziyue
|
48d82daa5c
|
添加bom头
|
2021-06-28 16:02:13 +08:00 |
|
ziyue
|
8f730b8dab
|
整理代码
|
2021-06-28 10:36:50 +08:00 |
|
ziyue
|
430229fe94
|
Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev_test
|
2021-06-28 10:11:39 +08:00 |
|
ziyue
|
02bd01c83b
|
完善http option命令
|
2021-06-28 10:10:09 +08:00 |
|
夏楚
|
fae86a9b4b
|
!11 合帧逻辑 加强判断,防止 SPS PPS VPS 作为一帧,rtmp h264/h265 打包 保证帧内必须有VCL
Merge pull request !11 from xiongguangjie/dev
|
2021-06-28 02:02:49 +00:00 |
|
xiongziliang
|
3f36a10bee
|
Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev
|
2021-06-26 18:28:31 +08:00 |
|
夏楚
|
4609716ba3
|
Merge pull request #933 from CharleyWangHZ/master
|
2021-06-26 03:55:17 +08:00 |
|
xiongguangjie
|
6d8d64caf6
|
for mergen
|
2021-06-25 21:24:53 +08:00 |
|
ziyue
|
a7f75774e9
|
整理RtpReceiver相关代码
|
2021-06-25 16:24:44 +08:00 |
|
ziyue
|
964cf39145
|
RtcpContext修改时间戳单位、整理WebRTC相关代码
|
2021-06-25 14:59:27 +08:00 |
|
CharleyWangHZ
|
332e8fa180
|
Update HttpSession.cpp
|
2021-06-25 11:17:21 +08:00 |
|
CharleyWangHZ
|
248c9e8f9a
|
Update HttpSession.h
|
2021-06-25 10:59:56 +08:00 |
|
CharleyWangHZ
|
e3d17848f6
|
Update HttpSession.cpp
|
2021-06-25 10:59:06 +08:00 |
|
ziyue
|
3862c8f1da
|
删除多余行
|
2021-06-24 17:53:37 +08:00 |
|
xgj
|
e9d28c1386
|
Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-06-24 11:53:15 +08:00 |
|
ziyue
|
307be4339f
|
Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test
|
2021-06-23 17:32:09 +08:00 |
|
ziyue
|
8717cd2f3d
|
优化代码
|
2021-06-23 11:09:53 +08:00 |
|
ziyue
|
d9de40526d
|
解决开启rtp推流鉴权导致udp丢包的问题,提升GB28181推流秒开体验
|
2021-06-23 11:02:39 +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 |
|
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 |
|
xgj
|
2335043cdf
|
drop SEI and AUD for h264 and h265 avoid sei as a frame
|
2021-06-18 15:19:21 +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 |
|
ziyue
|
f8467f21fb
|
推流失败时打印日志
|
2021-06-17 11:34:24 +08:00 |
|
ziyue
|
60a2346819
|
媒体源注销后不做无谓推流重试
|
2021-06-17 11:32:57 +08:00 |
|
ziyue
|
752590f804
|
完善addStreamPusherProxy相关功能并修复自动删除相关的bug
|
2021-06-17 11:01:14 +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
|
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 |
|