amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-27 05:38:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,853 Commits 16 Branches 0 Tags 225 MiB
30182701f5
Commit Graph

2010 Commits

Author SHA1 Message Date
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
ziyue
4d0db1b7c1 兼容时间戳不规范的H265流：#894 2021-06-15 12:55:55 +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
0593f65fcb 完善代码 2021-06-08 14:50:12 +08:00
ziyue
e88281b2ff 删除无效代码 2021-06-08 14:49:48 +08:00
ziyue
9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-06-08 14:41:52 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
c4817c6d5f GB28181单端口接收流支持多线程 2021-06-08 14:03:25 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xgj
8721c5a62b for joy4 rtmp push onMetaData compatibility 2021-06-08 10:07:51 +08:00
xgj
0f3a8f4a9d fix webrtc to rtmp multi slice on frame error 2021-06-07 17:32:28 +08:00
ziyue
8f62365847 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-26 10:43:52 +08:00
夏楚
3b4e7619ad
Merge pull request #865 from yapingcat/master 
fix bug rtcp sr包的 ssrc 和rtp包中ssrc的不一致
 2021-05-22 11:04:50 +08:00
xiongziliang
9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-05-22 10:25:05 +08:00
xiongziliang
975c11b74c 支持http响应无content-length字段的情况:#850 2021-05-22 10:22:56 +08:00
xiongziliang
7067472a18 转协议支持全局关闭音频:#883 2021-05-22 10:17:52 +08:00
xiongziliang
f54e02f511 修复http文件服务器相关bug 2021-05-22 09:28:19 +08:00
xiongziliang
8cbec43ee8 合并代码 2021-05-22 09:26:49 +08:00
xiongziliang
a391d1e289 修复rtsp推流带参相关的bug:#840 2021-05-22 09:25:24 +08:00
xiongziliang
08d4edddb0 修复http文件服务器相关bug 2021-05-22 09:13:00 +08:00
yapingcat
3c49b3737e fix bug rtcp sr包的 ssrc 和rtp包中的一致 2021-05-17 09:20:03 +08:00
xiongziliang
d395d23eeb 由于在RtspSession类确保了函数执行顺序，所以回滚多余代码也能确保单track流迅速注册 2021-05-15 10:05:47 +08:00
xiongziliang
4cd618899b Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-15 10:02:58 +08:00
xiongziliang
125b703ea9 Merge remote-tracking branch 'origin/master' 2021-05-15 09:57:21 +08:00
xiongziliang
e807a08f2e 单track rtsp推流加快媒体注册速度 2021-05-15 09:56:35 +08:00
xia-chu
5c90a1e137 完善nack与丢包重传 2021-05-11 11:18:55 +08:00
xiongziliang
e8d3dec050 getBitArray方法返回nack第一个包状态 2021-05-11 00:34:17 +08:00
xiongziliang
ec8e518180 完善fci相关代码 2021-05-10 23:27:11 +08:00
xia-chu
45abc23e87 放宽fci长度校验 2021-05-10 10:14:00 +08:00
xiongziliang
0377796c03 修复clang下编译警告和错误 2021-05-08 19:33:51 +08:00
xia-chu
842257edaa 完善rtcp ext 2021-05-06 12:02:16 +08:00
xia-chu
cbee3210a0 完善twcc fci 2021-05-06 12:01:56 +08:00
xia-chu
6274cbdd28 统一代码风格 2021-04-30 14:31:08 +08:00
夏楚
1d0eca512b !6 优化rtsp推流单个Track其他协议的注册速度，不需要等待3s 
Merge pull request !6 from xiongguangjie/dev
 2021-04-30 14:29:36 +08:00
xia-chu
3cc640f96e 删除无效配置 2021-04-30 11:44:06 +08:00
xia-chu
88e1c323c3 删除无效配置 2021-04-30 09:24:09 +08:00
xgj
5145c7e658 optimize one track ready speed not wait 3000ms 2021-04-29 18:36:04 +08:00
xia-chu
e021279fab 修复"Too short data for FU-A H.264 RTP packet"的问题 2021-04-28 16:07:01 +08:00
xia-chu
514a028eac 修复fu-a打包时，无rtp负载的情况 2021-04-28 16:03:05 +08:00
xia-chu
ac55ae79fb 修复fci内存越界问题 2021-04-28 13:55:00 +08:00
xia-chu
1d84bb5458 完善twcc相关逻辑 2021-04-26 21:50:31 +08:00
xia-chu
6c951c8ca9 完善rtcp padding相关逻辑 2021-04-26 21:50:10 +08:00
xia-chu
2d8ef45e4d 完善fci相关代码 2021-04-26 21:03:04 +08:00
xia-chu
aa54adb1ab 修复编译问题 2021-04-26 20:29:06 +08:00
xia-chu
cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-26 19:50:17 +08:00
xia-chu
af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu
a28c76a33c 限制未就绪状态track的最大帧缓存数量 2021-04-26 14:58:06 +08:00
xia-chu
fbc8c2286e 等待添加fci相关适配代码 2021-04-23 18:30:37 +08:00
xia-chu
8702ad101b 完善rtcp feedback相关代码 2021-04-23 18:27:47 +08:00
xia-chu
93160c0ec7 添加rtpfb枚举与工具类 2021-04-23 15:25:33 +08:00
xia-chu
48338af700 完善FCI相关代码 2021-04-23 15:06:55 +08:00
xia-chu
743862d786 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-23 09:43:08 +08:00
xiongziliang
259247132a Merge remote-tracking branch 'origin/master' 2021-04-22 22:13:17 +08:00
xiongziliang
f70bfb5f8b 兼容GB28181 tcp推流缓存覆盖的垃圾设备 2021-04-22 22:02:21 +08:00
xia-chu
99a1d06d9b 修正TWCC错误理解 2021-04-22 18:56:12 +08:00
xia-chu
90ad90cb78 初步完成TWCC包的解析 2021-04-22 17:34:26 +08:00
xia-chu
5db6154707 添加TWCC部分代码 2021-04-22 11:43:33 +08:00
xia-chu
dc3d59952e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-20 17:58:21 +08:00
xia-chu
0bb87858a3 提升单track情况下秒开体验 2021-04-20 17:53:43 +08:00
xia-chu
9b951ab69a 单track情况下最多等待3秒 2021-04-20 17:32:40 +08:00
xia-chu
ef0371ef94 修复编译警告 2021-04-20 17:32:22 +08:00
xia-chu
007c04d958 编译警告修复 2021-04-20 17:17:56 +08:00
xia-chu
cce9de74d3 完善rtcp nack相关代码 2021-04-20 17:15:01 +08:00
xiongziliang
f69a23565d Merge remote-tracking branch 'github/master' into dev 2021-04-18 23:13:47 +08:00
xiongziliang
387574a802 rtp主动推流时不触发无人观看事件:#799 2021-04-18 21:34:34 +08:00
xiongziliang
980867965c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-18 21:04:10 +08:00
xiongziliang
7884338b60 修复rtmp协议amf3不兼容的bug 2021-04-18 21:02:01 +08:00
xia-chu
880b9139b0 性能优化 2021-04-15 19:46:45 +08:00
xia-chu
d76c38ef72 调整264 rtp打包逻辑 2021-04-15 19:40:17 +08:00
xia-chu
9d385b36fd 优化多slice情况下关键帧判断逻辑 2021-04-15 19:40:17 +08:00
xia-chu
e00fe51b26 关闭测试代码 2021-04-15 19:40:17 +08:00
xia-chu
46e3538dca Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-04-15 16:22:21 +08:00
xgj
3150ccdb70 add some comment 2021-04-15 14:08:25 +08:00
Your Name
bffee09639 fix more slice nal one frame result rtp mark error and sps pps rtp not has a mark 2021-04-15 13:54:03 +08:00
xgj
6e4dfaf53f fix webrtc h264 rtp Packetizer error 2021-04-15 00:15:41 +08:00
xia-chu
765db1eb8b 添加rtcp fci相关代码 2021-04-14 18:39:21 +08:00
xia-chu
a4ba0c2b60 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-14 09:26:11 +08:00
xia-chu
c4fd9e294a Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-14 09:25:56 +08:00
xiongziliang
37096f8ed0 完善rtcp的定义 2021-04-13 22:27:57 +08:00
xia-chu
29c8c9bf26 Merge remote-tracking branch 'origin/dev' into dev 2021-04-13 18:51:16 +08:00
xia-chu
f939e0a894 添加一些rtcp fci相关定义 2021-04-13 18:50:20 +08:00
夏楚
136d126e74 Update RtpReceiver.cpp 2021-04-13 08:28:23 +08:00
xia-chu
46b84fcf39 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-12 13:48:34 +08:00
xia-chu
8a51bd2d9e 新增rtp ssrc异常处理逻辑 2021-04-11 20:35:00 +08:00
xiongziliang
753fe05813 采用pts 2021-04-11 12:07:04 +08:00
xiongziliang
8b7289a689 rtsp推流支持关闭直接代理模式 2021-04-11 12:06:40 +08:00
xiongziliang
012f58d27c 添加rtp 调试接口 2021-04-11 01:15:02 +08:00
xiongziliang
b2afae0e8a 暂时屏蔽一些日志 2021-04-07 21:02:28 +08:00
xia-chu
155c59e17e 添加rtc类型的推流 2021-04-07 18:17:49 +08:00
xia-chu
f374f72312 添加rtcp bye相关代码 2021-04-07 16:58:05 +08:00
xiongziliang
2abb5078f9 实现rtc转rtsp 2021-04-03 09:34:49 +08:00
ziyue
33d2e71368 合并代码，去除冗余代码 2021-04-02 16:23:40 +08:00
xiongziliang
a328520c9c buf fixed 2021-04-01 22:24:35 +08:00
xiongziliang
2434470fb8 G711强制规格 2021-04-01 22:20:29 +08:00
xiongziliang
d2fec801c9 兼容不规范的rtmp推流器：#764 2021-04-01 22:03:21 +08:00
xiongziliang
075756c4c6 提升兼容性：#789 2021-04-01 21:46:02 +08:00
ziyue
2065b6fea8 去掉最大枚举定义 2021-03-30 11:51:19 +08:00
ziyue
a7a94f0885 sdp相关的代码移动到主目录 2021-03-30 10:59:15 +08:00
xiongziliang
81f29fea61 基本完成sdp的解析和生成 2021-03-28 18:10:43 +08:00
xiongziliang
8aa3ff425b 完善sdp相关定义 2021-03-27 22:23:38 +08:00
ziyue
2f0bdf2724 修复32位编译时，websocket相关bug 2021-03-21 18:22:32 +08:00
xiongziliang
f2edf354de rtmp支持更新config帧 2021-03-21 16:50:15 +08:00
ziyue
c5b0485519 修复sps太长生成sdp异常的问题 2021-03-18 16:10:46 +08:00
ziyue
51ac93a08c rtp超时检测最多暂停5分钟 
更新zltoolkit
 2021-03-16 15:37:34 +08:00
ziyue
060b654252 修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟 2021-03-16 11:31:41 +08:00
xiongziliang
a0fc494ee3 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit 2021-03-14 10:34:33 +08:00
xiongziliang
be8403c31c 完善代码 2021-03-14 10:29:17 +08:00
sunhui
f5e8bae760 解决不指定流或者TCP暂停断流问题 2021-03-10 23:17:15 +08:00
xiongziliang
c0f4899950 录制接口支持指定切片时间大小:#747 2021-03-07 10:41:57 +08:00
xiongziliang
5b4fe604cb 修复编译警告 2021-03-07 10:05:23 +08:00
xiongziliang
43828d4390 兼容某些rtmp流 2021-03-07 10:04:27 +08:00
xia-chu
9b7c9b9109 兼容sdp不规范的rtsp流 2021-02-28 21:02:23 +08:00
xiongziliang
fb3603b433 兼容一些不规范的流 2021-02-28 20:58:30 +08:00
xiongziliang
56f044f8ed 修复线程安全bug 2021-02-28 20:58:25 +08:00
xia-chu
8d50d3c397 分包逻辑添加边界检测代码 2021-02-21 22:24:46 +08:00
xia-chu
0c728827aa 添加全局内存统计功能 2021-02-21 21:28:17 +08:00
xia-chu
a19f67679a 兼容一些rtsp流 #735 2021-02-21 21:27:26 +08:00
xia-chu
19f3b1bd6f 防止打印过多调试信息 2021-02-21 21:26:45 +08:00
xia-chu
8d122625c5 修复28181相关bug：#731 2021-02-09 14:19:07 +08:00
xia-chu
b7f4eae2bc 修复bug 2021-02-09 14:01:10 +08:00
xia-chu
e4904623a7 修复rtmp兼容性bug 2021-02-07 23:01:22 +08:00
xia-chu
1f52c727ca 修复编译警告 2021-02-07 22:56:36 +08:00
xia-chu
a142665375 确保线程安全 2021-02-07 22:02:03 +08:00
xia-chu
75d97b9221 优化H264 rtp相关代码 2021-02-07 18:29:48 +08:00
xia-chu
80bcf53ccf 更新ZLToolKit并适配代码 2021-02-06 20:10:34 +08:00
xia-chu
14b318525e 添加rtp rtmp个数统计 2021-02-06 20:10:33 +08:00
xia-chu
62ba87dd0f 优化frame性能及整理代码 2021-02-06 20:10:33 +08:00
xia-chu
c5cfbce241 优化rtp性能 2021-02-06 20:10:33 +08:00
xia-chu
b0e1d5d6aa 重写rtp去冲突逻辑 2021-02-06 20:10:32 +08:00
xia-chu
d6fc56d950 时间戳异常时,确保合并帧逻辑正常：#724 2021-02-06 20:10:32 +08:00
xia-chu
52480717e3 p帧时间戳异常时确保rtmp播放正常:#724 2021-02-06 20:10:32 +08:00
xia-chu
34bbfc8bcb 修复编译警告 2021-02-06 20:10:32 +08:00
xia-chu
bc6286553a 优化rtmp性能 2021-02-06 20:10:31 +08:00
xia-chu
827158af73 防止未开启录制功能时，使用该功能导致的bug 2021-02-06 20:10:31 +08:00
xia-chu
2b3ce0ec63 流量统计事件确保0字节时也能触发 2021-02-06 20:10:31 +08:00
xia-chu
39229f9e39 修复rtp padding相关bug:#722 2021-02-06 20:10:30 +08:00
xia-chu
3298184c5c 添加打印rtp详情功能 2021-02-06 20:10:30 +08:00
xia-chu
1539e4ed60 优化rtsp性能 2021-02-06 20:10:30 +08:00
xia-chu
e4126809a6 实现28181 rtcp保活:#429 2021-02-06 20:10:29 +08:00
xiongziliang
e695d76ce9 整理代码 2021-01-31 21:09:25 +08:00
xiongziliang
ddd3438fc3 添加bom头 2021-01-31 20:46:55 +08:00
xiongziliang
eef5407aab 性能优化 2021-01-31 20:36:19 +08:00
xiongziliang
8db9f86a0a 防止重复添加RtcpContext 2021-01-31 20:26:11 +08:00
xiongziliang
51435d955c 优化rtp统计性能 2021-01-31 20:22:01 +08:00
xiongziliang
070bf19cb5 重写rtp框架 2021-01-31 20:03:51 +08:00
xiongziliang
4d6d56f2b7 消除编译警告 2021-01-31 19:38:01 +08:00
xiongziliang
5c6560f55d 重写rtcp框架 2021-01-31 19:33:33 +08:00
xiongziliang
629c39685b rtp打包添加mark位:#713 2021-01-31 19:18:20 +08:00
xiongziliang
ae8588089d 修复windows下组播拉流失败的问题:#708 2021-01-31 19:08:58 +08:00
xiongziliang
837597e162 防止可能内存越界的问题 2021-01-31 18:25:12 +08:00
xiongziliang
0f39565f67 修复http直播不发送content-type的问题 2021-01-31 18:24:03 +08:00
xiongziliang
272d1a8bd9 兼容一些rtmp推流器: #692 2021-01-23 10:06:38 +08:00
xiongziliang
aa45590c13 添加对象统计接口 2021-01-23 09:44:37 +08:00
xiongziliang
291caf537a H265 rtp支持聚合包 2021-01-23 09:43:16 +08:00
xia-chu
f63b2b1863 去除编译警告，修复bug 2021-01-19 16:05:38 +08:00
xiongziliang
5d752c89b5 修复编译问题 2021-01-17 20:15:08 +08:00
xia-chu
b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
4cae88e242 调整代码 2021-01-17 10:28:52 +08:00
xiongziliang
d879c5901d 延迟清空状态 2021-01-17 10:28:06 +08:00
xiongziliang
c445ad2cdf 修复rtsp播放器在处理rtp包时，清空状态导致的bug 2021-01-17 10:25:00 +08:00
xiongziliang
2dd87c8b59 修复直接拉流代理失效的bug 2021-01-17 10:22:51 +08:00
xiongziliang
a9be01fbec 播放flv流时,非AAC与H264编码时,打印警告日志 2021-01-09 19:03:02 +08:00
夏楚
48a1f6ea6c
兼容rtp时间戳一直为0的流 2021-01-09 17:53:21 +08:00
xia-chu
0e3c21932d 修复编译失败的问题 2021-01-03 15:55:26 +08:00
xiongziliang
4b22e189d5 轮流发送rtcp与GET_PARAMETER保活:#642 2021-01-02 22:32:13 +08:00
monktan
3ddc14d35d 合并pr(#661): 减少unsport code打印，新增git信息获取 
(cherry picked from commit 47f2f5b349)
 2021-01-02 22:02:23 +08:00
xiongziliang
d37607026f 修复编译警告 2021-01-02 21:58:14 +08:00
xiongziliang
9715787060 bug fixed 2021-01-02 21:26:23 +08:00
xiongziliang
13221ad796 http回复根据状态码自动生成status message: #602 2021-01-02 21:24:06 +08:00
xiongziliang
c69e9b8ec1 主动发送rtp接口(startSendRtp)支持返回本地端口: #538 2021-01-02 20:43:02 +08:00
xiongziliang
122c853119 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into open_src 2021-01-02 20:06:29 +08:00
xiongziliang
bb5223e51a 不识别的rtp payload type按照ps处理:#673 2021-01-02 20:02:38 +08:00
陈晓林
2cb2fa1510
修复拉取rtsp流 SETUP 返回 454 Session Not Found 2020-12-29 12:16:35 +08:00
xiongziliang
61b29efe94 统一代码风格 2020-12-27 21:21:31 +08:00
夏楚
4244cbf29e
Merge pull request #656 from rmokerone/master 
RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586)
 2020-12-27 21:00:34 +08:00
夏楚
537ae2f412
Merge pull request #651 from sunhui2013/master 
添加停止、恢复rtp代理rtp超时检查功能,解决播放器暂停后断流问题
 2020-12-27 20:56:33 +08:00
ziyue
fd15fe70b2 合并 https://gitee.com/kingyuanyuan/ZLMediaKit 2020-12-27 18:41:53 +08:00
ziyue
2941068724 优化rtsp客户端代码 2020-12-27 18:11:10 +08:00
Liu Jiang
923768623a L16格式消除unknown codec提醒,添加只支持RTSP协议推流拉流提醒 2020-12-26 16:52:36 +08:00
Liu Jiang
d270a78089 getTrackType和getCodecName函数适配L16 2020-12-26 16:01:08 +08:00
Liu Jiang
525949c362 将CodecL16放置到enum最后,防止兼容性问题 2020-12-26 16:00:35 +08:00
Liu Jiang
66a3b7a9ca RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586) 2020-12-26 15:08:01 +08:00
sunny
cbc1f91904
Update RtpServer.h 2020-12-25 17:08:51 +08:00
sunhui
c32c2146b2 添加停止、恢复rtp代理rtp超时检查功能 2020-12-25 16:05:38 +08:00
xiongziliang
584ea17dc5 删除不必要的日志 2020-12-19 19:47:43 +08:00
xiongziliang
250d9f8e54 优化GB28181 tcp推流 2020-12-19 19:46:18 +08:00
xiongziliang
76a55c6c08 修复笔误 2020-12-19 18:59:22 +08:00
xiongziliang
544797e501 解决rtsp播放器TEARDOWN不传url的问题：#631 2020-12-19 09:20:24 +08:00
夏楚
a60cf0b9a4
Merge pull request #635 from mirsfang/master 
fix disable hls and rtpproxy compile error
 2020-12-19 09:14:48 +08:00
mirs
6c853008fc fix disable hls and rtpproxy compile error 2020-12-18 18:32:12 +08:00
wxf
2242f7ecc5 修正 CentOS 6 下使用 devtoolset 8 编译问题 
使用 inttypes.h 提供的 PRIu64 需要定义 __STDC_FORMAT_MACROS,
而 cinttypes 会定义该宏.

https://stackoverflow.com/a/8132440/5218590
 2020-12-17 20:47:31 +08:00
xiongziliang
8b134d5b2d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src 2020-12-13 09:56:26 +08:00
xiongziliang
f1c9b7b09c 修复播放器线程安全问题：#611 2020-12-13 09:52:00 +08:00
xiongziliang
b7d1a5059a 提高rtmp协议兼容性 2020-12-13 09:51:08 +08:00
ziyue
dc3701e6cc 修复rtp存在ext时无法解析的bug:#585 2020-12-06 21:08:16 +08:00
xiongziliang
b90ebf6511 合并pr:#607 2020-12-05 12:31:28 +08:00
夏楚
955ecde533
Merge pull request #607 from alongL/master 
Update HttpTSPlayer.cpp
 2020-12-05 12:29:20 +08:00
xiongziliang
3f37ef618d 删除文件太小的录像 2020-12-05 12:25:52 +08:00
xiongziliang
55cf411c1e 支持bitrate 2020-12-05 12:22:17 +08:00
along
7131649779
Update HttpTSPlayer.cpp 
保存http status返回值，在非200或206的情况下，不再进行数据判断。
 2020-12-03 10:23:46 +08:00
xiongziliang
a64ce68592 解决单Track时，等待时间太长的问题 2020-11-29 09:38:04 +08:00
xiongziliang
a5b4da7db5 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src 2020-11-29 09:36:12 +08:00
xiongziliang
c4c978be44 去除编译警告 2020-11-29 09:34:02 +08:00
xiongziliang
e7569c8cbc 删除多余日志 2020-11-29 09:33:49 +08:00
sunhui
48788cf25b 解决RtpServer启动UDPServer收流造成崩溃问题 2020-11-28 02:39:21 +08:00
hewenyuan
50927548e9 增加多路RTP视频流输出 2020-11-27 17:19:55 +08:00
xiongziliang
f7433b0f90 头文件中隐藏不必要的宏，避免宏蔓延：#554 2020-11-21 22:39:32 +08:00
xiongziliang
408a678ade 修复编译问题：#584 2020-11-21 22:32:01 +08:00
xiongziliang
9c585ce5a1 http客户端，host字段添加port，防止异常：#579 2020-11-21 22:16:58 +08:00
xiongziliang
c512c1a02e 关闭vhost时，m3u8中ts文件不指定vhost：#560 2020-11-21 21:54:12 +08:00
xiongziliang
1cc3add97f 提升按需转协议性能与体验 2020-11-15 00:59:31 +08:00
xiongziliang
0f54351811 按需转协议默认关闭(意即一直转协议) 2020-11-15 00:43:42 +08:00
xiongziliang
bb9b39d821 添加按需转协议开关，默认一直转协议：#569 2020-11-15 00:40:46 +08:00
xiongziliang
ebbe124d00 修复不能立即关闭拉流代理的问题：#559 2020-11-15 00:00:22 +08:00
xiongziliang
3d8f015f5d GB28181推流，无人观看时不解复用数据 2020-11-14 23:11:28 +08:00
xiongziliang
a93c57eb59 修复ehome推流相关bug: #549 2020-11-07 17:46:37 +08:00
xiongziliang
57a11f19dd 提高rtsp兼容性: #551 2020-11-07 17:45:58 +08:00
xiongziliang
ba7251f345 修复偶尔获取H265宽高失败的问题 2020-11-07 17:45:16 +08:00
xiongziliang
bad419e41f 修复cts小于0的问题 2020-11-07 17:44:30 +08:00
xiongziliang
d957b6816a rtp推流支持h264负载：#360 2020-11-01 22:27:44 +08:00
xiongziliang
d36e64eff4 提升性能 2020-11-01 21:33:42 +08:00
xiongziliang
700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
xiongziliang
5c7a08eb7c 添加bom头 2020-10-24 23:37:43 +08:00
xiongziliang
b5a25793c4 修复rtp tcp推流情况下获取Origin相关失败的问题 2020-10-24 23:34:22 +08:00
xiongziliang
ab9a605a66 优化代码结构 2020-10-24 23:33:13 +08:00
xiongziliang
289e4f695a 校验rtp是否合法 2020-10-24 23:32:43 +08:00
xiongziliang
18459db8f1 支持ehome推流：#514 2020-10-24 23:32:23 +08:00
xiongziliang
38a002646d 修复FFmpeg拉流代理功能缺陷的问题：#533 2020-10-24 23:31:58 +08:00
xiongziliang
8cb564de0a 优化直播源类型说明 2020-10-24 23:31:22 +08:00
xiongziliang
bfdd02905c 重连时，注销直接拉流代理的流：#532 2020-10-24 23:30:25 +08:00
xiongziliang
dd2abd7924 修复拼写错误 2020-10-24 23:30:06 +08:00
xiongziliang
c5f1b4cd52 程序退出时清空RtpProcess对象 2020-10-24 23:29:44 +08:00
xiongziliang
fd898254f2 修复fu rtp打包的bug 2020-10-24 23:29:21 +08:00
xiongziliang
84784f21c4 优化性能 2020-10-24 23:28:56 +08:00
xiongziliang
02c4aa3f4b 优化代码 2020-10-24 23:28:25 +08:00
xiongziliang
44bb1ba5ef rtp端口取偶数:#526 2020-10-20 10:38:31 +08:00
xiongziliang
130c411ae4 修复添加track太晚导致的bug: #528 2020-10-20 10:21:35 +08:00
xiongziliang
b7d6442870 tcp情况下，rtp长度不得超过2K，防止发送端存在缓存覆盖的bug 2020-10-18 23:05:24 +08:00
xiongziliang
e3364e9029 优化代码 2020-10-18 21:39:22 +08:00
xiongziliang
51fcaeda4c 更新第三方库 2020-10-18 21:33:36 +08:00
xiongziliang
fcf641dfb6 优化rtp排序算法 2020-10-17 14:46:59 +08:00
xiongziliang
2965248346 修复std::move后智能指针无效的问题 2020-10-10 18:44:48 +08:00
xiongziliang
209689121a 消除编译警告 2020-10-10 18:36:29 +08:00
xiongziliang
dfaa8b540c 使用临时变量和std::move减少智能指针的拷贝构造 2020-10-10 18:23:25 +08:00
xiongziliang
4d39176877 重写rtp排序算法:#510 2020-10-01 21:33:07 +08:00
xiongziliang
bc36e000b3 提炼rtp排序算法 2020-10-01 19:02:14 +08:00
xiongziliang
a1de3bfd30 添加流创建时间、在线时间 2020-10-01 18:57:15 +08:00
xiongziliang
cd27e5a9f9 注意！hls mp4录制的customized path字段改成录制根目录 相当于配置文件中hls mp4录制根目录相关设置 2020-10-01 14:55:34 +08:00
xiongziliang
728dd3ec3c 合并pr:#509 2020-10-01 14:53:15 +08:00
xiongziliang
eccb1a664c Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit 2020-10-01 13:39:19 +08:00
xiongziliang
7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
qiuzhouwei
4132df89cd 增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等 2020-09-28 10:45:59 +08:00
xiongziliang
bae52db6ba 修复关闭某些功能后，编译失败的问题 2020-09-27 16:54:55 +08:00
xiongziliang
5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang
4f42f508d5 复用代码 2020-09-26 09:39:38 +08:00
baiyfcu
8b6394d43d
Merge pull request #19 from xia-chu/master 
update
 2020-09-22 17:20:22 +08:00
xiongziliang
efdc105b40 减少内存拷贝，提升性能 2020-09-21 14:56:58 +08:00
xiongziliang
416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang
08a5891bdc 修复url解析相关bug 2020-09-20 20:15:39 +08:00
xiongziliang
016ca9465f 添加bom头 2020-09-20 19:50:08 +08:00
xiongziliang
d971eccf92 新增支持HTTP-fMP4 WebSocket-fMP4直播 2020-09-20 19:45:37 +08:00
xiongziliang
4ce1a25f09 修复MP4解复用时不写入adts头的问题 2020-09-20 19:45:21 +08:00
xiongziliang
071d0a9fd1 提炼MP4相关接口和代码 2020-09-20 19:45:04 +08:00
xiongziliang
2dd1046131 合并fmp4和mov接口 2020-09-20 19:44:20 +08:00
xiongziliang
d3cb0e3d39 ts直播源注销时关闭播放器 2020-09-20 00:57:34 +08:00
xiongziliang
2d0cf5cdd9 解决http-ts直播与hls直播冲突的问题 2020-09-20 00:55:22 +08:00
xiongziliang
c76930e3cd 支持http-ts/websocket-ts直播 2020-09-20 00:21:46 +08:00
xiongziliang
f84981dc75 合并pr(添加录制ts完成通知): #479 2020-09-20 11:40:42 +08:00
xiongziliang
0fce108de5 Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr 2020-09-20 11:01:45 +08:00
xiongziliang
5104252474 修复HLS直播结束后，最后一个切片无法写入的问题 2020-09-20 10:56:54 +08:00
xiongziliang
100af97d51 修复死锁问题:#486 2020-09-20 10:43:25 +08:00
xiongziliang
07ef417250 优化HLS直播相关代码 2020-09-20 10:13:15 +08:00
xiongziliang
9c873e1d19 去除转协议开关参数 2020-09-20 09:26:00 +08:00
wxf
748bb8e488 统一 mp4 及 ts 录像信息定义 2020-09-15 19:09:26 +08:00
wxf
b22a6e3dbd 添加 ts 切片是否通知选项, 默认为不通知 2020-09-15 17:46:12 +08:00
wxf
188e087fc2 添加 hls ts 切片录制完成通知 2020-09-14 13:20:45 +08:00
wxf
a024c51536 修正警告: moving a local object in a return statement prevents copy elision 
https://www.viva64.com/en/w/v828/

编译器会对返回本地变量优化([Named] Return Value Optimization (RVO/NRVO)),
无论是 C++11 之前还是之后, 添加 move 后反而会影响该优化.

C++ Core Guidelines F.48: Do not return std::move(local)
 2020-09-13 11:07:19 +08:00
xiongziliang
9b305bd4ae 优化HLS播放个数统计 2020-09-12 21:27:34 +08:00
xiongziliang
d26b751273 修复hls播放器流量统计不准确的bug 2020-09-12 20:52:53 +08:00
xiongziliang
1e1b3794da HLS切片间隔以数据时间戳为准:#463 2020-09-12 20:49:00 +08:00
xiongziliang
1b9550cfc4 修复HLS按需生成相关bug 2020-09-12 20:42:58 +08:00
xiongziliang
3b5053af50 修复关闭HLS后，编译失败的问题 2020-09-12 19:46:58 +08:00
xiongziliang
be1e872f0c 完善按需转协议(包括hls) 2020-09-12 19:20:18 +08:00
xiongziliang
268a7fec10 修复hls播放鉴权相关bug 2020-09-12 19:14:35 +08:00
xiongziliang
898c6ff24f 修复mark bit相关错误 2020-09-12 19:13:58 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
xiongziliang
aff9963f95 兼容某些多帧粘合在一起的流 2020-09-12 19:06:26 +08:00
xiongziliang
c711eedaa7 适配ZLToolKit代码,支持自定义创建Socket:#468 2020-09-12 19:03:52 +08:00
xiongziliang
9a088f4825 提高PSRtpSender对象的线程安全性 2020-09-12 18:53:51 +08:00
xiongziliang
dc192c95fc 优化hls播放速度 2020-09-12 18:53:16 +08:00
Zhou Weimin
01284323eb 忽略AUD帧; 2020-09-12 13:45:16 +08:00
qingci
299b988ed1
Update MultiMediaSourceMuxer.cpp 
{fix} fix _ps_rtp_sender not found in MultiMediaSourceMuxer.cpp [compile problem]
 2020-09-10 19:28:30 +08:00
xiongziliang
9c96f8d31a 确保PSRtpSender对象的线程安全 2020-09-06 21:09:19 +08:00
xiongziliang
0878f776b3 修复某些场景下rtmp定位关键帧不准确的bug 2020-09-06 18:22:04 +08:00
xiongziliang
51ae8d4083 复用忽略协议查找流的相关代码 2020-09-06 18:19:54 +08:00
xiongziliang
599e8493ca 添加utf8-bom头 2020-09-06 18:09:31 +08:00
xiongziliang
e7ac7fd5f9 优化HLS平滑播放逻辑 2020-09-06 17:56:45 +08:00
xiongziliang
faa8786f8f 兼容一些奇怪的流 2020-09-06 17:56:26 +08:00
xiongziliang
09e484794b 实现ps-rtp的发送 #366 2020-09-06 17:56:05 +08:00
xiongziliang
ac70597216 优化getTrack接口相关代码 2020-09-06 17:54:52 +08:00
xiongziliang
28262b158f 优化性能 2020-09-06 17:53:22 +08:00
xiongziliang
16e21e0205 修复直接拉流代理时有些事件不生效的bug 2020-09-06 17:52:57 +08:00
xiongziliang
636068b2b8 精简代码，改善代码结构 2020-09-06 17:52:33 +08:00
xiongziliang
eca9236955 优化与拦截代码 2020-09-06 17:52:07 +08:00
xiongziliang
74d6689a65 rtp解包采用自有代码 2020-09-06 17:51:21 +08:00
xiongziliang
9fa2221a79 整理代码 2020-09-06 17:51:00 +08:00
xiongziliang
9bfbe02f73 添加最大帧长度参数 2020-09-06 17:50:24 +08:00
xiongziliang
84cfe66da0 修复由于音视频同步导致时间戳回退的问题 2020-08-30 09:15:39 +08:00
xiongziliang
29fcf3eb3b 完善代码 2020-08-30 09:15:02 +08:00
xiongziliang
aedb1a8866 修复hls无人观看事件不触发的bug 2020-08-30 09:14:45 +08:00
xiongziliang
a7e99b9d37 整理代码 2020-08-30 11:40:03 +08:00
xiongziliang
fbd711a6bb 整理代码 2020-08-30 10:48:34 +08:00
xiongziliang
4255914613 ts打包过滤没有adts头的aac：#453 2020-08-23 17:57:30 +08:00
xiongziliang
0456cee336 修复添加aac静音前缀未设置的问题 2020-08-15 09:51:31 +08:00
xiongziliang
62da32477e ps rtp推流支持4个字节的头 2020-08-15 09:48:27 +08:00
xiongziliang
f23e117751 MultiMediaSourceMuxer默认能处理大部分事件 2020-08-08 12:20:13 +08:00
xiongziliang
b3f048f194 修复adts符合包相关bug 2020-08-08 12:19:04 +08:00
xiongziliang
873f8bc5ac 精简代码 2020-08-08 12:18:02 +08:00