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
xiongziliang
0087f50aaa
修复rtp组播性能问题
2020-08-08 12:17:43 +08:00
xiongziliang
2fd567b8b0
1、ws-flv直播支持客户端主动关闭请求:#430
...
2、兼容CONTINUATION类型的websocket包
3、修复websocket客户端在处理Content-Length时的相关bug
2020-08-08 12:17:06 +08:00
xiongziliang
e7e8969b4f
ps解析添加外部缓存
2020-08-08 12:13:35 +08:00
xiongziliang
30bbbd2e2f
修复缓存不够导致获取vps/sps/pps失败的问题
2020-08-08 12:12:46 +08:00
xiongziliang
47cc97f696
修复rtmp增长时间戳相关问题
2020-08-04 11:10:40 +08:00
xiongziliang
a9b0ca9cdd
hls支持opus
2020-08-01 20:56:34 +08:00
xiongziliang
a93e3a395e
添加bom头
2020-08-01 10:24:28 +08:00
xiongziliang
a22f97c777
rtsp/rtmp/mp4支持opus并整理代码
2020-08-01 10:22:12 +08:00
xiongziliang
b4a3b608ab
修复rtmp增长时间戳相关bug
2020-08-01 10:20:27 +08:00
xiongziliang
4d82d0ffdf
修复丢失小帧的bug
2020-08-01 10:17:09 +08:00
xiongziliang
c7225dffbc
整理rtsp客户端代码
2020-08-01 10:14:42 +08:00
xiongziliang
5d436d0a1f
修复websocket服务端收到close请求后未断开连接的问题:#430
2020-08-01 10:13:42 +08:00
xiongziliang
3acfb15c99
完善H264 rtp解包打包相关代码
2020-07-26 19:56:39 +08:00
xiongziliang
c0fde62480
完善aac rtp解析
2020-07-24 20:10:47 +08:00
xiongziliang
4281a1272e
Merge remote-tracking branch 'origin/master'
2020-07-24 20:04:53 +08:00
xiongziliang
a44a63423c
解决rtsp推流,aac时间戳增量太大导致flv.js播放异常的问题:#392
2020-07-24 20:03:35 +08:00
baiyfcu
90bbdf95a9
Merge pull request #18 from xiongziliang/master
...
update
2020-07-20 11:37:23 +08:00
Zhou Weimin
04840742cf
修复rtsp拉流rtp FU-A最后一个分片size为0的问题;#424
2020-07-19 07:21:18 +00:00
xiongziliang
7254c39fc2
rtsp推流采用相对时间戳,防止音视频不同步:#392
2020-07-16 16:36:26 +08:00
xiongziliang
c31b0cc26b
H264Track不过滤SEI: #411
2020-07-16 16:26:13 +08:00
xiongziliang
f84b3d90b4
流未找到事件中,可以立即返回播放失败: #417
2020-07-16 16:00:31 +08:00
xiongziliang
85f28ce1f0
修复seq溢出时的日志误报:#418
2020-07-16 15:46:34 +08:00
xiongziliang
7f8aa7b3d6
Merge remote-tracking branch 'origin/master'
2020-07-16 10:41:28 +08:00
xiongziliang
bdb28c53de
重命名前确保关闭mp4文件:#416
2020-07-16 10:40:30 +08:00
lyg1949
f420509c5c
修复点播rtmp时多出一个后缀名的bug
...
vlc,mpv等播放rtmp时的url规则与代码中注释的不同,导致出现2个后缀名
2020-07-15 14:17:18 +08:00
xiongziliang
0bb593f817
rtp推流无人观看时,自动关闭端口:#410
2020-07-14 09:50:06 +08:00
xiongziliang
b588053571
整理rtsp服务器相关代码
2020-07-10 10:42:23 +08:00
xiongziliang
bc5931dce9
修复G711生成RTP类型无效的bug
2020-07-09 11:15:01 +08:00
xiongziliang
a164b28608
优化rtp解析代码
2020-07-08 23:23:11 +08:00
xiongziliang
d191347839
修复bug
2020-07-08 22:49:08 +08:00
xiongziliang
d4908c3162
提高rtsp客户端健壮性
2020-07-08 22:29:08 +08:00
xiongziliang
be65ec5f1d
提供rtsp服务器稳定性
2020-07-08 22:19:05 +08:00
xiongziliang
1c19394b3d
防止rtmp协议重复生成Track
2020-07-08 21:39:30 +08:00
xiongziliang
7bce212701
修复rtsp重复推流判断无效的bug:#394
2020-07-08 12:42:05 +08:00
xiongziliang
b2ff53037b
http api新建的rtp服务器可以自动超时移除
2020-07-08 10:25:30 +08:00
xiongziliang
e58a63c528
优化代码
2020-07-08 10:09:16 +08:00
xiongziliang
248b2d5cb9
完善GB28181推流
2020-07-08 09:36:10 +08:00
xiongziliang
477f99b756
支持动态创建GB28181收流端口并可指定stream_id:#338
2020-07-07 10:01:12 +08:00
xiongziliang
30260e5414
复用printSSRC函数
2020-07-07 09:58:08 +08:00
xiongziliang
b603b8a68d
支持http api动态添加或关闭rtp服务器
2020-07-02 22:23:43 +08:00
xiongziliang
3c858a8351
添加媒体注册回调事件:#373
2020-07-02 18:14:39 +08:00
xiongziliang
e679e74695
去除多余#include
2020-06-30 21:14:51 +08:00
xiongziliang
d2c052a673
优化代码逻辑
2020-06-30 21:11:59 +08:00
xiongziliang
9e42772b48
rtmp aac config包没有负载
2020-06-30 21:08:52 +08:00
xiongziliang
29077dcef4
rtmp播放成功时确保aac track处于ready状态
2020-06-30 21:00:45 +08:00
xiongziliang
41c75fb66a
新增是否开启浏览http目录的配置选项:#367
2020-06-30 09:16:02 +08:00
xiongziliang
bbcb4d41f7
修复ps解析误判为aac的bug
2020-06-29 11:55:13 +08:00
xiongziliang
038979b716
修改rtmp metadata codec由字符为整形,兼容比较老的rtmp服务器
2020-06-28 21:49:08 +08:00
xiongziliang
fd77398291
修复dts计算可能导致不同步的问题:#369
2020-06-28 15:24:08 +08:00
xiongziliang
f67e9fce9a
修复访问悬垂指针的可能
2020-06-28 15:21:41 +08:00
xiongziliang
66c5a7169a
修复metadata中没duration导致播放失败的bug:#362
2020-06-24 11:02:35 +08:00
xiongziliang
e76bc65243
修复开启转协议后,无人观看掐流延时不定期的bug
2020-06-19 10:19:42 +08:00
baiyfcu
a46218965a
Merge pull request #17 from xiongziliang/master
...
update
2020-06-17 15:58:41 +08:00
baiyfcu
05a65d4961
merge stamp
2020-06-17 15:51:02 +08:00
xiongziliang
5f50441f43
降低第三方库头文件依赖性
2020-06-12 18:17:49 +08:00
xiongziliang
f03351a71a
修改dts生成逻辑
2020-06-11 23:06:01 +08:00
xiongziliang
efa92752c7
完善对高规格aac的支持
2020-06-11 19:21:46 +08:00
xiongziliang
b9006a90d4
优化rtmp推流时,aac config获取不完整的bug
2020-06-11 17:40:09 +08:00
xiongziliang
0e47dc94f9
aac config不再限制两个字节:#336
2020-06-11 17:19:10 +08:00
xiongziliang
7df092074d
修复m3u8起始阶段SEQUENCE错误的bug:#288
2020-06-09 14:21:57 +08:00
xiongziliang
974260156e
防止误报警告日志
2020-05-30 18:33:28 +08:00
xiongziliang
b7049b1407
精简代码
2020-05-30 14:43:08 +08:00
xiongziliang
31ad2caa6b
使用抛异常替代asset,提高代码稳定性
2020-05-30 11:49:36 +08:00
xiongziliang
fb4435fca9
rtp推流解析出frame才刷新保活计时器
2020-05-30 10:16:15 +08:00
xiongziliang
de96a4f0c8
优化代码
2020-05-28 18:19:39 +08:00
xiongziliang
406c5477e0
无metadata且不能获取Track的rtmp确保能注册
2020-05-28 18:01:03 +08:00
xiongziliang
41509800bc
完善对无metadata的rtmp流的兼容性
2020-05-28 17:03:12 +08:00
xiongziliang
0548256c30
合并写缓存优化对rtp的支持
2020-05-27 11:25:56 +08:00
xiongziliang
dea36cfc84
优化合并写逻辑,确保GOP缓存第一帧为关键帧并确保音视频数据的交织性
2020-05-27 11:09:02 +08:00
xiongziliang
a7bcfd566b
平滑动播放hls
2020-05-26 23:19:13 +08:00
xiongziliang
53ca43fb7d
提高性能
2020-05-26 21:04:53 +08:00
xiongziliang
7b90daab24
修复h264/h265 prefixSize计算错误的bug
2020-05-26 17:00:51 +08:00
xiongziliang
7d8dbb2a4b
修复websocket客户端相关bug:#311
2020-05-26 12:11:44 +08:00
xiongziliang
876111698e
优化时间戳相关代码
2020-05-26 10:30:39 +08:00
xiongziliang
ff7914e441
修改MediaSource相关接口
2020-05-26 10:11:58 +08:00
xiongziliang
e063cb3a00
兼容一些不规范的rtsp流
2020-05-25 21:54:43 +08:00
xiongziliang
0626f9a2bf
修复拼写错误
2020-05-25 18:33:42 +08:00
xiongziliang
8d1801339c
优化rtsp鉴权事件
2020-05-25 18:22:21 +08:00
xiongziliang
20d3757986
http-flv/ws-flv先触发on_play再触发on_stream_not_found
2020-05-25 17:38:36 +08:00
xiongziliang
68d910e229
限制rtsp/rtmp推流url合法性
2020-05-25 16:40:41 +08:00
xiongziliang
5ae887a279
websocket客户端销毁时主动发送close信令: #311
2020-05-25 14:36:58 +08:00
xiongziliang
07089ea4e2
websocket协议支持随机掩码
2020-05-25 14:36:07 +08:00
xiongziliang
c20a1337a5
完善rtp丢包日志
2020-05-25 14:28:02 +08:00
xiongziliang
893564d0be
修复拼写错误
2020-05-25 13:51:00 +08:00
xiongziliang
06d61cf195
添加全局时间戳覆盖逻辑
2020-05-25 12:07:38 +08:00
xiongziliang
51a86f502f
完善h264帧split逻辑
2020-05-21 14:10:55 +08:00
xiongziliang
c02438f9c8
hls播放器兼容带参数的url
2020-05-21 14:10:27 +08:00
xiongziliang
3c1e0531de
修复循环引用的问题
2020-05-21 11:44:57 +08:00
xiongziliang
5cc4258ba2
兼容OPTIONS命令返回401、302等命令
2020-05-19 10:47:46 +08:00
xiongziliang
477475a60f
批量添加bom头、批量替换tab字符
2020-05-18 15:31:49 +08:00
xiongziliang
7bc7d95249
hls支持https
2020-05-18 09:24:51 +08:00
xiongziliang
0e26161574
修复hls播放失败不回调的bug
2020-05-17 19:10:08 +08:00
xiongziliang
bab11b426e
hls播放器通过测试
2020-05-17 19:06:14 +08:00
xiongziliang
a4aa34e4ae
初步添加hls播放器
2020-05-17 18:00:37 +08:00
xiongziliang
198f223d63
进一步抽象ts/ps解析代码
2020-05-17 18:00:23 +08:00
xiongziliang
cf599167c1
修复指针转换偏移量导致的bug
2020-05-15 21:48:29 +08:00
xiongziliang
be9e31bba2
修复指针转换偏移量导致的bug
2020-05-15 21:39:06 +08:00
xiongziliang
f71a9bfadf
修复rtsp播放器时间戳紊乱的bug
2020-05-15 20:15:43 +08:00
xiongziliang
cded823b65
ps rtp推流优化音视频时间戳同步问题
2020-05-15 18:21:28 +08:00
xiongziliang
1970f6014e
优化音视频同步
2020-05-15 18:08:54 +08:00
xiongziliang
0779a4bee6
完善rtsp 信令心跳包相关逻辑
2020-05-15 09:53:17 +08:00
xiongziliang
d27a8117e1
mp4录制支持opus
2020-05-12 11:48:15 +08:00
xiongziliang
7102b85d67
确保rtp/rtcp端口偶奇约定:#292
2020-05-12 10:37:23 +08:00
xiongziliang
8c46688886
确保rtp/rtcp端口号为偶奇数
2020-05-12 10:22:21 +08:00
xiongziliang
f303ab3222
确保rtp端口为偶数
2020-05-12 09:26:02 +08:00
xiongziliang
4ab270ca10
精简代码
2020-05-11 23:43:28 +08:00
xiongziliang
6356ffcb4f
隐藏细节代码
2020-05-11 23:34:57 +08:00
xiongziliang
70e9a20352
精简aac相关代码
2020-05-11 23:25:12 +08:00
xiongziliang
625d7e30c0
整理和精简代码
2020-05-11 22:33:10 +08:00
xiongziliang
41f1df3acf
可自定义codec
2020-05-11 12:06:15 +08:00
xiongziliang
91080e507c
发送GET_PARAMETER命令兼容一些rtsp服务器:#284
2020-05-09 14:04:08 +08:00
xiongziliang
3252f131ad
修复某些rtp包不兼容的bug
2020-05-08 21:57:56 +08:00
xiongziliang
a4d7b3463e
rtmp播放时,取相对时间戳逻辑确保时间戳同步
2020-05-06 18:54:28 +08:00
xiongziliang
920f06a996
AAC sdp添加通道数
2020-04-30 13:35:38 +08:00
xiongziliang
787081eb0c
修复websocket服务器可能存在的bug
2020-04-30 10:31:32 +08:00
xiongziliang
c64d1a3ad8
完善
2020-04-30 10:02:27 +08:00
xiongziliang
b649372873
修复split 264/265相关逻辑的bug
2020-04-30 10:00:55 +08:00
baiyfcu
6518e5d448
Merge pull request #16 from xiongziliang/master
...
update
2020-04-29 18:26:06 +08:00
xiongziliang
1067c5a2d3
再优化dts获取
2020-04-29 18:19:51 +08:00
xiongziliang
9d9f6e304e
完善dts计算算法
2020-04-29 18:05:29 +08:00
xiongziliang
3630839bc9
关闭转协议后,将关闭解复用以提供性能
2020-04-29 11:59:45 +08:00
xiongziliang
7e85be7654
添加rtmps服务器
2020-04-29 11:25:15 +08:00
xiongziliang
f9df7f5217
去除ultraLowDelay配置项
2020-04-29 11:08:43 +08:00
xiongziliang
4fbd45e408
h265新增支持两种类型的关键帧
2020-04-29 10:01:56 +08:00
xiongziliang
163b0875cf
修复h264 split后可能多个字节的bug
2020-04-28 22:24:31 +08:00
xiongziliang
7565a20695
startRecord API with "customized_path" #279
2020-04-28 15:24:08 +08:00
xiongziliang
0eb97d5471
修复不能控制录制路径的问题:#279
2020-04-28 09:40:47 +08:00
baiyfcu
98d0bc27f9
mk_player api 增加seek和获取进度以相对开始时间的接口以适应按时间轴方式回放的需求
2020-04-26 17:40:34 +08:00
xiongziliang
75cc34814f
保证不丢帧
2020-04-26 15:19:32 +08:00
xiongziliang
b2fe3cd05d
加锁
2020-04-26 11:25:25 +08:00
xiongziliang
2c9141513d
ts/ps支持G711
2020-04-26 09:45:00 +08:00
xiongziliang
f222af2632
完善代码
2020-04-24 15:28:27 +08:00
xiongziliang
e85a8f277e
RTMP协议限制G711规格、日志打印codec相关信息
2020-04-24 15:08:28 +08:00
xiongziliang
2e74d5c957
修复合并写相关bug: #282
2020-04-24 13:51:04 +08:00
xiongziliang
b4228f91c3
适配ZLToolKit
2020-04-24 12:39:22 +08:00
xiongziliang
1c03acbdb9
完善网络相关信息
2020-04-23 23:33:58 +08:00
xiongziliang
26cfb5ae73
完善网络相关信息
2020-04-23 23:30:24 +08:00
xiongziliang
0df25942aa
rtp推流初步添加事件
2020-04-23 23:18:24 +08:00
xiongziliang
00c21cd99e
优化代码
2020-04-23 22:22:24 +08:00
xiongziliang
eda7a59f3c
统一事件参数类型
2020-04-23 22:04:59 +08:00
xiongziliang
b6946a5968
事件广播触发者改成SockInfo对象
2020-04-23 21:38:44 +08:00
xiongziliang
4d84661a87
更新ZLToolKit
2020-04-23 17:50:12 +08:00
xiongziliang
b09919d374
替换inet_ntoa线程安全版本
2020-04-23 16:14:24 +08:00
xiongziliang
b2e324efdc
完善日志
2020-04-23 15:43:22 +08:00
xiongziliang
2e3cee09bb
hls/mp4录像/mp4点播/ts解析/ps解析初步支持G711
2020-04-23 15:19:20 +08:00
xiongziliang
1d5c6cb141
整理解析器
2020-04-20 18:13:45 +08:00
xiongziliang
b7b839a06f
修复编译错误
2020-04-18 23:58:29 +08:00
xiongziliang
49596bd97f
简化接口
2020-04-18 23:56:27 +08:00
xiongziliang
3efda8fd0b
根据playload type生成track
2020-04-18 23:00:48 +08:00
xiongziliang
bacf8f100b
G711支持多种规格
2020-04-18 22:13:11 +08:00
xiongziliang
5c3418a412
合并 #278
2020-04-18 18:46:20 +08:00
xiongziliang
1f43359b31
Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit
2020-04-18 16:05:49 +08:00
baiyfcu
40afa204d5
增加rtmp/rtsp对音频G711A,G711U的支持
2020-04-17 17:47:10 +08:00
xiongziliang
1a97c2e3cd
优化特定情况下丢帧问题
2020-04-17 15:19:42 +08:00
xiongziliang
d363871601
修复一些mp4点播不支持的问题
2020-04-13 09:44:05 +08:00
xiongziliang
895e7d4714
完善rtp推流
2020-04-10 14:08:10 +08:00
xiongziliang
99a55ddaaa
添加合并写功能
2020-04-09 16:19:03 +08:00
baiyfcu
5fcc22bab7
useBuf暂定为true时seek失败
2020-04-08 16:15:47 +08:00
baiyfcu
340629cdc6
添加对g711A/U rtsp支持相关文件,api添加windows静态库编译选项,g711 RTMP支持尚未修改
2020-04-08 15:42:52 +08:00
baiyfcu
fb77293648
修复rtsp seek播放时rtsp server返回npt字段不对问题
2020-04-08 15:37:16 +08:00
xiongziliang
0fc1499643
添加性能测试模式
2020-04-08 11:16:09 +08:00
xiongziliang
5025d7d4cc
修复rtsp点播时不触发播放成功回调的问题
2020-04-07 18:09:25 +08:00
xiongziliang
b169f94cce
大幅提高rtsp服务器性能
2020-04-07 13:03:53 +08:00
xiongziliang
1352e159f1
优化性能
2020-04-07 10:26:07 +08:00
xiongziliang
1896b1d768
优化代码
2020-04-06 21:44:32 +08:00
xiongziliang
45c5f1ec4c
避免死锁
2020-04-06 21:23:35 +08:00
xiongziliang
e192931429
修复动态添加HlsMediaSource后无法获取Track列表的问题
2020-04-05 10:32:42 +08:00
xiongziliang
d3db5e0ce0
完善录制相关功能
2020-04-05 09:48:38 +08:00
xiongziliang
e5d5cabf89
部分恢复录制相关接口
2020-04-05 09:26:29 +08:00
xiongziliang
f226aed145
全面支持265(包括rtmp)
2020-04-04 23:20:42 +08:00
xiongziliang
070c2c46d7
完善代码
2020-04-04 23:13:10 +08:00
xiongziliang
c25307a105
新增H265 rtmp支持
2020-04-04 22:55:06 +08:00
xiongziliang
83400290a8
整理rtmp相关代码
2020-04-04 22:54:49 +08:00
xiongziliang
7019e4717c
整理授权协议
2020-04-04 20:30:09 +08:00
xiongziliang
11420b868b
整理代码
2020-04-04 19:55:11 +08:00
xiongziliang
67f4ca4b83
修复mp4循环点播逻辑不生效的bug
2020-04-04 16:08:31 +08:00
xiongziliang
708300951b
优化rtmp点播
2020-04-04 15:37:37 +08:00
xiongziliang
cefb2a7cc4
hls/mp4录制不再能随时开启或关闭
2020-04-04 14:33:12 +08:00
xiongziliang
a581f78d12
优化点播相关代码
2020-04-04 08:30:20 +08:00
xiongziliang
6e5cd0345d
优化点播相关代码
2020-04-03 23:27:16 +08:00
xiongziliang
1ca81e39fe
提高H264点播兼容性
2020-04-03 23:03:47 +08:00
xiongziliang
42eece5b9a
mp4点播无人观看时自动关闭
2020-04-03 22:39:44 +08:00
xiongziliang
c3c4c72d1d
去除mp4v2依赖
2020-04-03 22:28:27 +08:00
xiongziliang
d07161f18f
点播时间轴兼容VLC
2020-04-03 22:17:40 +08:00
xiongziliang
0a31b03064
完善MP4点播
2020-04-03 22:08:03 +08:00
xiongziliang
47d8e37e3d
完善mp4点播
2020-04-03 22:04:13 +08:00
xiongziliang
278591d5ee
修复MP4点播相关bug
2020-04-03 21:39:44 +08:00
xiongziliang
095834fe57
重写MP4点播
2020-04-03 20:46:55 +08:00
xiongziliang
46be8a38e7
重写MP4点播
2020-04-03 20:45:58 +08:00
xiongziliang
f03365efb1
提高对echo show设备的兼容性
2020-04-03 14:09:03 +08:00
xiongziliang
c145f5f8ba
修复#247
2020-03-26 17:12:21 +08:00
xiongziliang
e5c0b5ebb8
修复#245
2020-03-23 10:35:35 +08:00
xiongziliang
ace200716a
修复无人播放事件触发延时不准确的bug
2020-03-23 10:21:17 +08:00
xiongziliang
1168174c2b
tab统一替换为4个空格键:#242
2020-03-20 11:51:24 +08:00
xiongziliang
c7d9e7b38e
删除多余代码
2020-03-20 09:46:29 +08:00
xiongziliang
b15cd86514
新增HTTP HEAD命令的支持,目的是兼容一些播放器
2020-03-16 09:33:00 +08:00
xiongziliang
1c14239d89
修复编译问题
2020-03-13 18:34:12 +08:00
xiongziliang
a6928a0bfe
优化url编解码
2020-03-12 18:19:22 +08:00
xiongziliang
119d90bc58
优化url编解码
2020-03-12 18:14:47 +08:00
xiongziliang
e4e5400641
优化虚拟主机相关
2020-03-12 12:47:15 +08:00
xiongziliang
e90319a1f2
http服务器支持OPTIONS命令
2020-03-11 20:58:41 +08:00
xiongziliang
2b592780ad
修复aac rtp解包内存越界的bug
2020-03-11 18:52:28 +08:00
xiongziliang
f76a203768
完善注释
2020-03-10 23:22:48 +08:00
xiongziliang
038617a6c4
新增拉流代理源相关api
2020-03-10 22:56:56 +08:00
xiongziliang
b3554fb721
消除编译警告
2020-03-09 16:04:34 +08:00
xiongziliang
502e3bff5f
解决ps rtp解包问题
2020-03-08 22:10:37 +08:00
xiongziliang
10884340b0
优化rtp推流相关代码
2020-03-08 21:19:20 +08:00
xiongziliang
ae45c24fa3
解决ts误判的问题
2020-03-07 16:09:57 +08:00
xiongziliang
069bde09c1
支持ts rtp流
2020-03-06 13:00:06 +08:00
xiongziliang
a89e81d3f3
完善日志
2020-03-05 18:04:34 +08:00
xiongziliang
448f6fa3c7
优化rtp代理超时管理
2020-03-05 11:36:31 +08:00
xiongziliang
c77f82f02c
尝试添加rtp类型自动判断逻辑
2020-03-04 22:25:00 +08:00
xiongziliang
f384f5e025
解决死锁问题
2020-03-04 21:57:31 +08:00
xiongziliang
109fab2cb1
RTP代理支持完整的事件
2020-02-28 16:25:14 +08:00
xiongziliang
e6eee321ea
优化临界状态丢起始帧的问题
2020-02-27 12:31:57 +08:00
xiongziliang
a0001bf2f4
优化日志友好度
2020-02-25 19:00:22 +08:00
xiongziliang
86b053db3b
优化代码
2020-02-25 18:53:11 +08:00
xiongziliang
d60101b93c
优化单Track情况下等待3秒的情况
2020-02-25 14:59:40 +08:00
xiongziliang
f76109c629
兼容ssrc为0的rtp推流
2020-02-23 12:16:20 +08:00
xiongziliang
a7a376b3f2
流量汇报事件添加id参数
2020-02-13 12:10:08 +08:00
xiongziliang
7e25537957
流量汇报事件添加客户端ip和端口参数
2020-02-13 11:33:59 +08:00
xiongziliang
51e0c71007
添加更多录制相关方法
2020-02-01 22:58:58 +08:00
xiongziliang
e8ba94ba09
还原代码
2020-02-01 22:58:21 +08:00
xiongziliang
6a97fcb3de
媒体注册、重置事件改成同步触发
2020-02-01 22:57:48 +08:00
xiongziliang
075a615a92
Merge branch 'research' of https://gitee.com/liuziloong/FreeNVR
2020-02-01 21:20:57 +08:00
xiongziliang
92f69c3915
优化纯音频流的延时
2020-01-24 22:16:28 +08:00
xiongziliang
a9539eb626
HLS遇到I帧才切片:#226
2020-01-24 22:00:55 +08:00
xiongziliang
224a35dbd5
解决单音频无法录制mp4的bug
2020-01-24 21:09:47 +08:00
xiongziliang
90c6dd4bfa
修复关闭hls后无法编译通过的问题
2020-01-24 20:54:39 +08:00
xiongziliang
4470f2e427
添加addTrackCompleted方法,缩短流注册延时
2020-01-22 19:09:53 +08:00
xiongziliang
ac33592319
修复死锁的问题
2020-01-21 11:05:51 +08:00
xiongziliang
f5187e8b0d
优化GOP相关逻辑
2020-01-20 16:22:25 +08:00
liuziloong
795860a019
修复目录级别错误
2020-01-20 15:22:20 +08:00
liuziloong
2384aa5bbd
MP4录像增加一级目录,按照:年月/年月日/*.mp4存储;
...
增加按月,按天查询mp4录像;
消除一处编译器警告;
2020-01-20 15:02:45 +08:00
xiongziliang
caa870c37e
websocket服务器支持根据url选择不同的运行逻辑
2020-01-15 15:11:42 +08:00
xiongziliang
2610ba7c8b
修复rtmp注册时还未生成完整config包的bug
2020-01-15 11:46:15 +08:00
xiongziliang
444137e5b7
重写GOP缓存机制
2020-01-15 11:07:55 +08:00
xiongziliang
0a4b59031f
及时推拉流也能确保第一帧为关键帧
2020-01-14 19:41:55 +08:00
xiongziliang
a573d7302b
提高rtsp客户端兼容性
2020-01-14 18:11:10 +08:00
xiongziliang
491ed6f83d
rtsp不允许覆盖时间戳(pts)
2020-01-14 10:34:05 +08:00
xiongziliang
4a7d17334c
rtsp不允许覆盖时间戳(pts)
2020-01-14 10:29:27 +08:00
xiongziliang
d8dbf43490
优化dts生成性能
2020-01-14 10:25:14 +08:00
xiongziliang
ec67900665
优化不含B帧时的dts生成性能
2020-01-14 10:06:35 +08:00
xiongziliang
9fa6e9d8d9
添加dts生成算法,兼容含B帧的rtsp推流
2020-01-14 10:04:24 +08:00
xiongziliang
b55db11de3
解决rtmp过早注册的问题
2020-01-13 15:48:55 +08:00
xiongziliang
66ec67bfb9
1、修复生成的rtmp无法被flash播放的问题
...
2、修复RTSP有B帧时,相对时间戳计算异常的问题
2020-01-13 11:51:29 +08:00
xiongziliang
db146406c3
修复gcc4.85无法编译的问题
2020-01-10 15:29:21 +08:00
xiongziliang
653132b38c
去除多余日志
2020-01-08 14:03:56 +08:00
xiongziliang
ab32ca39a9
去除多余日志
2020-01-08 14:00:53 +08:00
xiongziliang
5d2864cff2
优化DevChannel内存拷贝问题
2020-01-08 12:15:59 +08:00
xiongziliang
57c5d2963a
优化DevChannel内存拷贝问题
2020-01-08 12:14:27 +08:00
xiongziliang
1ce9af35e3
1、复用rtsp url解析代码
...
2、修复rtsp/rtmp推流异常回调紊乱的问题
2020-01-04 12:03:53 +08:00
xiongziliang
cdba214e79
MP4录制修复兼容性问题
2020-01-03 14:27:26 +08:00
xiongziliang
d482dc1c05
完善http服务器mime类别
2020-01-02 18:24:11 +08:00
xiongziliang
52d831e990
简化hls cookie相关逻辑
2020-01-02 17:46:20 +08:00
xiongziliang
d082955510
合并#199
2020-01-02 16:29:20 +08:00
Gemfield
e31c1ee207
Add optional customized_path parameter for startRecord
2020-01-02 12:47:12 +08:00
xiongziliang
0063571f3a
解决hls中断恢复时播放器计数不准确的问题
2019-12-29 17:55:02 +08:00
xiongziliang
4d42459004
优化代码
2019-12-29 16:54:02 +08:00
xiongziliang
f48e611253
优化http文件服务器性能
2019-12-29 15:55:20 +08:00
xiongziliang
e91c26c052
实现hls的流量汇报事件
2019-12-29 15:38:29 +08:00
xiongziliang
e951efc615
优化hls直播性能
2019-12-29 14:00:20 +08:00
xiongziliang
c3302eec1e
优化hls播放器计数
2019-12-29 13:38:16 +08:00
xiongziliang
97ad062dcf
默认关闭rtmp时间戳覆盖
2019-12-29 12:16:02 +08:00
xiongziliang
236dc46b82
完成HLS按需生成流
2019-12-29 12:10:31 +08:00
xiongziliang
4b4c4e0cec
实现hls按需拉流
2019-12-29 11:52:02 +08:00
xiongziliang
54736859d4
基本完成hls相关的主要事件
2019-12-29 10:49:04 +08:00
xiongziliang
1afacdcff8
初步添加HlsMediaSource
2019-12-28 18:50:56 +08:00
xiongziliang
e72fa359b6
完善hls播放器个数计数
2019-12-28 16:57:35 +08:00
xiongziliang
f93b32740f
初步实现hls播放器个数计数
2019-12-28 16:48:42 +08:00
xiongziliang
94806b2cd6
初步实现hls播放器个数计数
2019-12-28 16:48:11 +08:00
xiongziliang
20d56b713f
性能优化
2019-12-28 13:39:25 +08:00
xiongziliang
71631a33c4
http服务器实现后台线程读取数据
2019-12-28 13:11:41 +08:00
xiongziliang
291969aee6
修复文件写缓存提前销毁的问题:#196
2019-12-27 15:36:54 +08:00
xiongziliang
118be421d6
添加bom头
2019-12-27 12:22:17 +08:00
xiongziliang
aaab52c94f
文件根目录httpRoot改成www,并且自动复制到相应目录
2019-12-27 12:15:38 +08:00
xiongziliang
e8951c129f
添加线程相关api
2019-12-27 10:46:40 +08:00
xiongziliang
11a7d1e6c4
完成tcp服务器/客户端 c api
2019-12-26 21:22:19 +08:00
xiongziliang
56397628da
修复未初始化导致的bug
2019-12-26 19:36:57 +08:00
xiongziliang
003021e24b
优化http服务器性能
2019-12-26 15:02:28 +08:00
xiongziliang
f7db9d3690
默认关闭虚假主机
2019-12-26 12:23:38 +08:00
xiongziliang
a30a4e24f1
修复rtsp推流转协议失败的bug
2019-12-26 12:20:34 +08:00
xiongziliang
453660ab79
整理MediaSource派生类
...
修复转协议或录制时忽然Track的问题
2019-12-26 12:10:54 +08:00
xiongziliang
9e8fe8c86a
完善代码
2019-12-26 12:09:35 +08:00
xiongziliang
3830792c57
整理MediaSource派生类
...
修复转协议或录制时忽然Track的问题
2019-12-26 11:53:19 +08:00
xiongziliang
761a665b1b
删除冗余设计
2019-12-26 09:43:44 +08:00
xiongziliang
d59a706cc1
简化代码
2019-12-25 20:07:42 +08:00
xiongziliang
31f5d77880
添加HttpRequester的C接口
2019-12-25 14:25:26 +08:00
xiongziliang
1bfe4937cd
整理MediaSource派生类代码
2019-12-25 11:04:12 +08:00
xiongziliang
bb4e8b73b5
兼容一些不规范的rtmp推流:#190
2019-12-25 10:13:59 +08:00
xiongziliang
e663ddd9a6
简化事件参数
2019-12-24 14:08:16 +08:00
xiongziliang
eb89a3e504
完善http服务器对不固定长度body的支持
2019-12-24 10:25:28 +08:00
xiongziliang
40c2326950
完善c接口事件定义
2019-12-23 18:50:46 +08:00
xiongziliang
92bc4fbbb1
c api测试程序防止退出时崩溃
2019-12-23 14:20:49 +08:00
xiongziliang
2da0c884a1
添加kBroadcastHttpBeforeAccess事件,拦截http文件下载事件
2019-12-23 12:47:04 +08:00
xiongziliang
f32f5df4eb
修复mp4录制崩溃的bug:#181
2019-12-18 18:40:41 +08:00
xiongziliang
73df1bb949
添加安全冗余代码
2019-12-18 15:02:55 +08:00
xiongziliang
a1e5724c70
优化hls录制
2019-12-17 09:18:11 +08:00
xiongziliang
1169f29ca6
fixed #175
2019-12-17 09:05:34 +08:00
xiongziliang
1cc6a0dce5
fixed #175
2019-12-17 09:04:10 +08:00
xiongziliang
5322a5761b
修复时间戳跳跃可能导致的问题
2019-12-16 16:17:52 +08:00
xiongziliang
3f12c0ccde
修复时间戳覆盖的累积误差
2019-12-16 15:49:52 +08:00
xiongziliang
c353c626c1
1、根据PS获取时间戳
...
2、修复rtp代理可能花屏的问题
2019-12-16 11:00:40 +08:00
xiongziliang
6d697daeb0
去除FrameMerger逻辑
2019-12-13 15:49:57 +08:00
xiongziliang
6e59000265
修复过滤多余帧类型导致的bug
2019-12-13 15:42:58 +08:00
xiongziliang
bd8a9a78e8
rtp代理防止时间戳回环
2019-12-13 15:42:12 +08:00
xiongziliang
5fe5dd9de6
hls保存ts文件时根据日期、时间保存
2019-12-12 22:58:31 +08:00
xiongziliang
ee66d945e8
更新media-server库
2019-12-12 22:25:55 +08:00
xiongziliang
99c1dd339f
修复adts头相关bug
2019-12-11 09:29:10 +08:00
xiongziliang
fa4fac1e0d
rtp推流由配置文件决定是否默认录制
2019-12-09 17:49:00 +08:00
xiongziliang
655a30081b
修复rtp(tcp)获取ssrc失败的bug
2019-12-06 20:18:08 +08:00
xiongziliang
adf0e09262
mp4点播支持pts
2019-12-06 17:23:49 +08:00
xiongziliang
0d9bdec182
支持rtp代理服务器
2019-12-06 11:54:10 +08:00
Gemfield
55d258fafc
Add rtp server
2019-12-05 19:20:12 +08:00
xiongziliang
10dc254510
完善stopRecord接口
2019-12-05 14:31:44 +08:00
xiongziliang
69c0c3e237
添加录制相关http api
2019-12-05 12:04:08 +08:00
xiongziliang
f581f0f2a7
优化精简录制相关代码
2019-12-05 10:47:23 +08:00
xiongziliang
6eb4d5916d
修复bug
2019-12-04 19:19:03 +08:00
xiongziliang
33047ddc94
程序退出前停止一切录制
2019-12-04 19:15:48 +08:00
xiongziliang
728fd55e0c
修复无法延后录制的bug
2019-12-04 18:58:19 +08:00
xiongziliang
ae230bc1aa
优化代码
2019-12-04 18:53:12 +08:00
xiongziliang
57043138d8
优化代码
2019-12-04 18:49:22 +08:00
xiongziliang
e69cbc1486
优化代码
2019-12-04 18:46:31 +08:00
xiongziliang
b3fcb4c038
重写mp4录制驱动机制
2019-12-04 18:36:30 +08:00
xiongziliang
d5a81d7105
规范命名
2019-12-04 10:59:13 +08:00
xiongziliang
de33d6a847
整理文件录制
2019-12-04 10:45:38 +08:00
xiongziliang
2c2e7262d6
修复bug
2019-12-03 16:14:52 +08:00
xiongziliang
5249c24430
整理MediaSource代码
2019-12-03 16:10:02 +08:00
xiongziliang
68718953d4
优化代码
2019-12-03 13:05:23 +08:00
xiongziliang
b50a34bf1f
优化代码
2019-12-03 12:43:48 +08:00
xiongziliang
c55f26fba7
整理MediaSink
2019-12-03 12:32:57 +08:00
xiongziliang
c1ab73f758
修复类型转换失败的bug
2019-11-30 22:14:22 +08:00
xiongziliang
cadff93d4d
1、hls cookie改成60秒有效期并且访问时刷新cookie
...
2、去除keep-alive下最大请求次数限制
2019-11-30 14:29:44 +08:00
xiongziliang
d46b67a5cf
精简代码
2019-11-30 11:56:40 +08:00
xiongziliang
12346f77a4
修复编译问题
2019-11-30 11:44:05 +08:00
xiongziliang
a44ab25d46
整理http文件服务器相关代码
2019-11-30 11:38:00 +08:00
xiongziliang
9b6ee8131b
hls用作点播时,那么m3u8文件实时记录为点播
2019-11-29 11:59:39 +08:00
xiongziliang
c42ee1dc5d
优化时间戳覆盖逻辑:#148
2019-11-29 09:54:48 +08:00
xiongziliang
bf70a01f6a
提升rtsp的兼容性
2019-11-25 17:59:04 +08:00
xiongziliang
21cf3bcee0
播放器track未初始化成功时间改成最大为5秒
2019-11-21 18:07:40 +08:00
xiongziliang
ab97486200
完善判断逻辑
2019-11-21 16:34:18 +08:00
xiongziliang
54f2c0b53c
兼容一些奇怪sdp的rtsp url
2019-11-21 16:31:50 +08:00
xiongziliang
e7bd5a4174
兼容一些奇怪的sdp
2019-11-21 15:11:43 +08:00
xiongziliang
083933cbad
修复访问野指针的问题:#146
2019-11-21 13:46:42 +08:00
xiongziliang
e6d511cc9e
解决播放成功与中途断开事件触发紊乱的问题:#143
2019-11-19 15:52:02 +08:00
xiongziliang
2eb64d2c39
确保rtp端口为偶数,rtcp端口为奇数
2019-11-19 10:20:57 +08:00
xiongziliang
0d42aab9e7
修复FFmpeg拉流代理无法通过close_stream接口关闭的bug
2019-11-18 12:07:11 +08:00
xiongziliang
1b6e61c413
1、修复#125
...
2、修复非法rtsp url导致异常的问题
2019-11-11 19:03:03 +08:00
xiongziliang
5a1503008f
完善注释
2019-11-08 15:55:26 +08:00
xiongziliang
a8a4f267f7
添加配置项,控制在关闭hook时,推流是否转协议或录制
2019-11-08 15:54:13 +08:00
xiongziliang
ccbd1d4a83
添加hls.segRetain配置项,修复hls切片等于segNum+1的问题
2019-11-05 10:27:28 +08:00
xiongziliang
a30a83d665
添加H265相关接口
2019-11-01 15:40:21 +08:00
xiongziliang
0bff2ad176
优化精简Http服务器代码
2019-10-29 09:16:52 +08:00
xiongziliang
43e1cc69a8
优化http服务器
2019-10-29 00:35:44 +08:00
xiongziliang
fd10ef1187
添加下载文件http api范例
2019-10-28 17:23:16 +08:00
xiongziliang
7ed5b7c2ba
http api服务器支持发送大文件
2019-10-28 16:50:15 +08:00
xiongziliang
7c16f37d64
优先判断文件然后再判断http-flv
2019-10-27 09:15:29 +08:00
xiongziliang
4ae66f0672
修复mmap相关bug
2019-10-27 03:42:56 +08:00
xiongziliang
4d1d6b1467
暂时禁用mmap
2019-10-27 03:00:19 +08:00
xiongziliang
6023885e93
抽象整理HttpBody类,fread模式下使用循环池提升内存性能
2019-10-27 02:04:51 +08:00
xiongziliang
144fb20339
http服务器支持mmap,提示性能
2019-10-26 18:41:42 +08:00
xiongziliang
a739bd7304
完善日志
2019-10-23 12:00:53 +08:00
xiongziliang
0aa28b2848
简化代码
2019-10-18 10:02:42 +08:00
xiongziliang
0f5582689b
防止越权访问
2019-10-18 09:58:22 +08:00
xiongziliang
67d2beb52a
配置文件支持相对路径,http文件服务器防止访问根目录父目录
2019-10-18 09:51:20 +08:00
xiongziliang
3bad329f09
修复resetTracks情况下 MP4录制可能出现的bug
2019-10-16 11:10:20 +08:00
xiongziliang
68d29ba025
rtsp忽略无效的aac track
2019-10-14 16:52:15 +08:00
xiongziliang
a68368a7f3
修复#109
2019-10-14 10:15:46 +08:00
xiongziliang
08386b958c
覆盖时间戳需要明确参数指定,防止误判
2019-10-12 22:44:16 +08:00
xiongziliang
4642bbeb4c
rtsp推流默认不覆盖时间戳
2019-10-12 22:02:50 +08:00
xiongziliang
d2406d239d
兼容一些奇怪的rtsp url
2019-10-12 11:22:17 +08:00
xiongziliang
c4aaaa11c7
优化hls生成
2019-10-12 10:29:40 +08:00
xiongziliang
7f203ce9b7
修复回复hls生成的bug
2019-10-11 19:01:34 +08:00
xiongziliang
f1ed019437
合并#106
2019-10-11 17:51:46 +08:00
Weiwei.Zhou
d6e60e0919
添加断流重连是否接着前一次继续写;修复断流重连成功后hls时间戳错误问题
2019-10-11 16:51:10 +08:00
Weiwei.Zhou
7d76a3eb9b
修复hls首个切片延迟生成的问题
2019-10-11 16:16:14 +08:00
xiongziliang
a604d8c620
mp4点播每次流化时间改成500毫秒,优化文件io性能
2019-10-10 17:52:19 +08:00
Weiwei.Zhou
f0deafd722
mp4录制完成后是否进行二次关键帧索引写入头部
2019-10-10 13:37:56 +08:00
xiongziliang
ec925a64e4
防止时间戳回滚
2019-10-08 12:55:19 +08:00
xiongziliang
201e06dc0b
fixed #102
2019-10-08 10:19:52 +08:00
xiongziliang
ba71bac475
提升sdp解析兼容性
2019-10-08 09:55:59 +08:00
xiongziliang
b1c8b24d18
提升sdp兼容性
2019-10-08 09:45:43 +08:00
xiongziliang
e5cb5c56a1
提升sdp解析兼容性
2019-10-08 09:44:08 +08:00
xiongziliang
eb12bc7397
提升sdp解析兼容性
2019-10-08 09:39:54 +08:00
xiongziliang
205b01f6d1
修复http文件服务器可能丢失数据的问题
2019-09-30 20:07:09 +08:00
xiongziliang
b573b5bbac
防止时间戳跳变
2019-09-30 16:51:17 +08:00
xiongziliang
c6270aa1f9
Merge pull request #99
2019-09-30 09:13:19 +08:00
Weiwei.Zhou
39a528cc02
停止写之后将最后的片段也写进m3u8文件中
2019-09-29 22:05:18 +08:00
xiongziliang
dd81a70bed
添加是否添加静音音频选项
2019-09-29 10:33:05 +08:00
xiongziliang
940c3ffbca
rtsp/rtmp点播改成后台线程读取
2019-09-27 18:05:42 +08:00
xiongziliang
4bc355b08a
支持hls点播录制
2019-09-26 14:21:20 +08:00
xiongziliang
86fcf69f81
提高rtsp对H264编码的sdp的兼容性
2019-09-25 22:16:35 +08:00
Weiwei.Zhou
67575bb2e1
添加文件循环读取
2019-09-24 20:48:30 +08:00
xiongziliang
fd89b2d0cf
MediaServer支持Android
2019-09-24 15:21:20 +08:00
xiongziliang
8552687559
提高对无Metadata的rtmp流的兼容性
2019-09-24 11:44:23 +08:00
xiongziliang
653667baf5
提高对无Metadata的rtmp流的兼容性
2019-09-24 11:42:27 +08:00
xiongziliang
928f642a27
完善注册rtmp机制,防止及时拉流不出画面的bug
2019-09-23 18:56:19 +08:00
xiongziliang
adfc084d4a
提高无Metadata的rtmp推流的兼容性
2019-09-23 17:08:00 +08:00
xiongziliang
1fda56ab6e
rtmp推流时,确保config帧收完后再注册
2019-09-23 16:53:04 +08:00
xiongziliang
cb7c72d9d9
修正metadata拼写错误,优化RtmpMediaSource注册机制,修复及时拉流不出画面的bug
2019-09-23 16:47:20 +08:00
xiongziliang
8ae9f56110
添加to_string接口
2019-09-21 19:27:55 +08:00
xiongziliang
8da9aee11a
兼容无metadata的rtmp流
2019-09-21 19:27:34 +08:00
xiongziliang
91adaaaab6
回滚代码
2019-09-20 14:05:23 +08:00
xiongziliang
9735d891da
整理代码
2019-09-20 10:37:41 +08:00
xiongziliang
5ad4103ce0
修正拼写错误
2019-09-20 10:36:37 +08:00
xiongziliang
3268daa42b
精简代码
2019-09-18 10:27:40 +08:00
xiongziliang
10e74b7eb6
修复websocket跨域问题
2019-09-17 10:29:15 +08:00
xiongziliang
ee8d28dbef
单独提供websocket服务器程序
2019-09-17 09:48:20 +08:00
xiongziliang
00e64ed279
添加注释完善代码
2019-09-16 18:02:33 +08:00
xiongziliang
78069ce0e5
添加bom
2019-09-16 17:46:39 +08:00
xiongziliang
644905a374
实现websocket客户端模板
2019-09-16 17:45:27 +08:00
xiongziliang
3095075749
完善websocket服务器
2019-09-16 17:42:52 +08:00
baiyfcu
671f22077a
添加websocket client支持
2019-09-12 13:44:38 +08:00
xiongziliang
96aa687fea
完善http文件访问鉴权逻辑
2019-09-11 16:37:49 +08:00
xiongziliang
8fe876c0ef
修复http文件鉴权漏洞
2019-09-11 15:51:42 +08:00
xiongziliang
7701a883e3
提高EasyDarwin的rtsp推流兼容性
2019-09-10 17:08:24 +08:00
xiongziliang
ae64bc9bcb
不指定协议转换时,默认转换hls,rtxp
...
提高EasyDarwin的rtsp推流兼容性
2019-09-10 17:01:42 +08:00
xiongziliang
d41d116a67
兼容带url参数的rtsp推流
2019-09-10 16:00:39 +08:00
xiongziliang
e67894a085
推流鉴权事件支持是否允许转rtsp/rtmp、hls 、mp4
2019-09-10 11:06:31 +08:00
zqsong
005db3cbc5
修复推送H265的时候,每一帧都split导致耗时过长
2019-09-09 10:44:34 +08:00
xiongziliang
2192451cd1
修复http文件鉴权相关bug
2019-09-09 09:41:23 +08:00
xiongziliang
47cb4b8edc
完善rtp打包
2019-09-06 23:23:43 +08:00
xiongziliang
203edc5cec
完善rtp打包
2019-09-06 23:22:04 +08:00
xiongziliang
9f1a91cda6
rtmp支持带后缀名的url
2019-09-06 18:30:42 +08:00
xiongziliang
39e3c89848
rtp打包减少一次内存拷贝
2019-09-06 15:16:22 +08:00
xiongziliang
d8de1e226c
完善对H265的sdp兼容性
2019-09-05 14:56:33 +08:00
xiongziliang
d6fa0296cb
添加配置项ultraLowDelay,可选择是否低延时模式
2019-09-04 18:57:54 +08:00
xiongziliang
d864e7084b
修复rtmp点播移动时间轴相关bug
2019-09-03 17:20:56 +08:00
xiongziliang
3c4d7498bc
完善兼容性
2019-08-30 16:56:57 +08:00
夏楚
cfc7dc2126
Merge pull request #74 from 3503207480/master
...
PR: 注释,说明, 除以0错误
2019-08-30 11:49:11 +08:00
3503207480@qq.com
a7953fdbca
除以0错误
...
有的rtsp设备无此参数,不能除以0
2019-08-30 11:18:25 +08:00
3503207480@qq.com
036b36f012
注释,说明
...
注释,说明
2019-08-30 11:17:27 +08:00
xiongziliang
64cf7efa13
删除无效代码
2019-08-30 10:34:00 +08:00
xiongziliang
e3139134e8
修复握手超时相关bug
2019-08-28 18:20:40 +08:00
xiongziliang
ab08f333d3
修复ws-flv可能播放失败的bug
2019-08-27 11:54:27 +08:00
xiongziliang
43608585a1
优化时间戳修正逻辑
2019-08-27 11:34:50 +08:00
xiongziliang
e7727e7e9b
修复某些流转换hls后花屏的问题
2019-08-27 11:34:20 +08:00
xiongziliang
06784d86be
完善websocket-flv直播错误响应
2019-08-23 09:45:01 +08:00
xiongziliang
1cff946848
MediaSource类添加getTracks接口
2019-08-22 17:48:10 +08:00
xiongziliang
a451da058c
修正mp4录制相关的宏定义
2019-08-22 17:46:47 +08:00
xiongziliang
fa030fa0cc
简化代码
2019-08-22 16:54:30 +08:00
xiongziliang
c6e9f8365d
规范类命名
2019-08-22 16:25:19 +08:00
xiongziliang
fb1d7dd5a6
rtsp推流拉流转发时修整sdp
...
rtsp推流修整时间戳
2019-08-22 16:05:35 +08:00
xiongziliang
bf7363714d
完善注释
2019-08-22 15:23:14 +08:00
xiongziliang
fc0544512b
优化rtmp时间戳修正
2019-08-22 14:56:58 +08:00
xiongziliang
113b7842d9
http cookie 可以保存更丰富的信息
2019-08-20 12:09:43 +08:00
xiongziliang
035a32ec24
修复rtp负载长度计算偏差
2019-08-20 09:30:39 +08:00
xiongziliang
8ba4c97286
修复rtp padding flag可能导致的bug
2019-08-20 09:22:13 +08:00
xiongziliang
8453f822b0
修复 #66
2019-08-19 23:08:41 +08:00
xiongziliang
4b65d9de95
新增win32可执行程序
2019-08-19 15:46:42 +08:00
xiongziliang
fa60a3c1d8
添加mac版本二进制文件
2019-08-19 14:59:56 +08:00
xiongziliang
c4f364c487
直接代理时sdp清洗后再使用
2019-08-15 19:13:31 +08:00
xiongziliang
453994f26b
减少内存拷贝,提高websocket服务器性能
2019-08-13 12:00:21 +08:00
xiongziliang
9f04062fc5
支持websocket(ssl)-flv 直播
2019-08-12 18:32:22 +08:00
xiongziliang
8e17300a17
初步支持websocket-flv直播
2019-08-12 18:14:51 +08:00
xiongziliang
7c7b9e560e
统一添加bom
2019-08-08 19:01:45 +08:00
xiongziliang
ef61c56cc2
优化hls生成
2019-08-07 18:24:08 +08:00
xiongziliang
b70d6cd2c2
支持修正时间戳
2019-08-06 22:54:37 +08:00
xiongziliang
2020e23437
兼容某些不规范的sdp
2019-08-06 16:23:20 +08:00
xiongziliang
008df0ab85
去除继承
2019-08-04 23:58:54 +08:00
xiongziliang
f9426c2cfb
尝试修复时间戳回环或乱序导致的问题
2019-08-02 18:06:37 +08:00
xiongziliang
6a9eb8d54b
尝试修复时间戳回环或乱序导致的问题
2019-08-02 17:33:31 +08:00
xiongziliang
36803ccedc
Merge remote-tracking branch 'origin/master' into zqsong
2019-08-02 13:51:34 +08:00
xiongziliang
36ed78ba1f
规范函数命名
2019-08-02 13:51:24 +08:00
xiongziliang
dd80d6a6bb
Merge branch 'dev' of https://github.com/zqsong/ZLMediaKit into zqsong
2019-08-02 13:40:15 +08:00
xiongziliang
892734bfd8
完善
2019-08-02 11:54:05 +08:00
xiongziliang
a400b39fab
修复可能丢帧的bug
2019-08-02 11:09:17 +08:00
xiongziliang
35c324b6b4
修复首帧不是I帧 导致花屏的问题
2019-08-02 10:53:00 +08:00
zqsong
0d57664fac
完善H265 sps解析,统一命名风格
2019-08-02 10:46:16 +08:00
xiongziliang
1f89019818
写mp4文件缓存可配置
2019-08-01 22:13:26 +08:00
xiongziliang
13a6d3ac16
完善写mp4文件
2019-08-01 22:07:40 +08:00
xiongziliang
6c0d89f417
修复生成mp4相关bug
2019-08-01 21:59:26 +08:00
xiongziliang
6d8db7d232
修复bug
2019-08-01 19:09:14 +08:00
xiongziliang
383a14a76d
重新mp4录制
2019-08-01 18:49:04 +08:00
xiongziliang
12e1068a39
Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong
2019-08-01 14:53:59 +08:00
xiongziliang
e13ae419ae
精简H264Frame对象,删除多余字段
2019-08-01 14:39:09 +08:00
xiongziliang
69098612bc
Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong
2019-08-01 14:06:34 +08:00
xiongziliang
2e95c3b2fa
修改Rtmp播放结果回调事件触发机制,防止秒开失败以及获取Track失败
2019-08-01 13:12:24 +08:00
zqsong
124cce34b6
mp4录制全部替换mp4v2为media-server
2019-08-01 11:44:16 +08:00
zqsong
7e92a0b738
MP4录制添加H265支持
2019-07-30 21:29:31 +08:00
zqsong
360eba2c68
MP4录制添加H265支持
2019-07-30 19:26:38 +08:00
xiongziliang
fbf0469ef2
完善跨域支持
2019-07-30 16:07:51 +08:00
xiongziliang
2068c873a5
完善跨域支持
2019-07-30 16:07:00 +08:00
xiongziliang
99ab975065
h265支持输入复合帧 拆帧代码复用
2019-07-30 13:54:19 +08:00
xiongziliang
66dc9c43be
修复windows下编译问题
2019-07-26 09:10:27 +08:00
xiongziliang
9640d8e33d
回复代码,防止兼容性问题
2019-07-25 12:18:17 +08:00
xiongziliang
6922d82c65
rtmp解复用支持无内存拷贝
...
hls生成支持输入无0x 00 00 01的H264/H265数据
2019-07-25 12:09:36 +08:00
xiongziliang
d2a889b463
优化类命名以及添加注释
2019-07-25 09:38:16 +08:00
xiongziliang
7baa35e594
修复hls由于缓存导致花屏的问题
2019-07-24 18:40:18 +08:00
xiongziliang
f50eaf8648
Frame添加cacheAbel接口
2019-07-24 18:02:55 +08:00
xiongziliang
91747947b9
优化变量名
2019-07-22 18:40:04 +08:00
xiongziliang
cf4482983b
统一使用MultiMediaSourceMuxer转协议
2019-07-22 18:37:32 +08:00
xiongziliang
3ca699721e
PlayerProxy、DevChannel、MultiMediaSourceMuxer类支持是否开启rtsp/rtmp功能
...
addStreamProxy增加enable_rtsp、enable_rtmp参数
2019-07-22 11:27:17 +08:00
xiongziliang
3c8f96f2a1
添加rtsps rtmps客户端支持
2019-07-20 20:53:50 +08:00
xiongziliang
ee8edb8ba8
完善注释
2019-07-19 11:58:23 +08:00
xiongziliang
9c0fb9e676
添加配置项:是否直接rtsp拉流代理
2019-07-19 11:54:29 +08:00
xiongziliang
d71f1dd293
本协议拉流代码支持任意编码格式
2019-07-19 11:30:39 +08:00
xiongziliang
e095a604ab
更新ssrc生成规则
2019-07-19 09:42:48 +08:00
xiongziliang
8bbd9d57c0
更改ssrc生成规则
2019-07-17 15:23:54 +08:00
xiongziliang
ff34b937f3
修复http头重复的bug
2019-07-17 14:54:14 +08:00
xiongziliang
917763c435
修复http头重复的bug
2019-07-17 14:50:24 +08:00
xiongziliang
4122084e05
MP4点播绑定固定线程
2019-07-11 14:51:40 +08:00
xiongziliang
7adddc361c
异步触发kBroadcastStreamNoneReader事件,修复#44
2019-07-11 14:38:54 +08:00
xiongziliang
757139312b
完善注释
2019-07-11 12:15:13 +08:00
xiongziliang
d0d730985f
完善rtsp播放器推流udp端口创建机制
2019-07-11 12:12:33 +08:00
xiongziliang
6518398aa5
修复某些rtsp服务器返回不规范导致兼容性问题
2019-07-11 11:53:11 +08:00
xiongziliang
5dce8eccde
精简代码
2019-07-03 16:42:20 +08:00
xiongziliang
e36194aec3
完善对pts的支持
2019-07-03 16:22:12 +08:00
xiongziliang
818d26aa66
添加onRedirectUrl事件
2019-07-01 20:55:31 +08:00
xiongziliang
ed78f152ee
Http client 302错误码支持
2019-07-01 18:35:26 +08:00
xiongziliang
339fdf0de4
Http client 302跳转
2019-07-01 17:48:09 +08:00
xiongziliang
3c91bf1351
Http client支持302跳转
2019-07-01 17:39:16 +08:00
xiongziliang
67f7c3dc8f
http客户端支持302跳转
...
修复HttpRequestSplitter可能内存越界的bug
2019-07-01 09:53:58 +08:00
xiongziliang
7aa0c2ae33
整理优化代码
2019-06-28 17:37:11 +08:00
xiongziliang
0b08831f5d
整理优化代码
2019-06-28 17:30:13 +08:00
xiongziliang
ea131d9740
整理优化代码
2019-06-28 17:25:53 +08:00
xiongziliang
27ce8a9915
整理优化代码
2019-06-28 16:55:28 +08:00
xiongziliang
bf39cf3e33
整理优化代码
2019-06-28 16:48:02 +08:00
xiongziliang
0a2c022fa8
优化代码
2019-06-28 16:12:39 +08:00
xiongziliang
034dbbf7ba
修复rtp打洞包相关的bug
2019-06-27 12:53:35 +08:00
xiongziliang
585201ece1
修复接收rtsp推流的兼容性问题
2019-06-27 12:21:01 +08:00
xiongziliang
d250e1b7ec
整理代码
2019-06-26 10:01:04 +08:00
xiongziliang
18a0691448
优化代码
2019-06-24 17:01:15 +08:00
xiongziliang
85f05adc06
优化代码,提升可读性
2019-06-24 16:56:46 +08:00
xiongziliang
9039f8c1f6
支持超大rtp包
2019-06-24 16:07:44 +08:00
xiongziliang
bede5500c8
修复Windows上的编译问题
2019-06-15 16:33:12 +08:00
xiongziliang
71f020dabc
修复http文件鉴权bug
2019-06-14 21:33:41 +08:00
xiongziliang
5c3092db51
代码优化
2019-06-14 18:51:50 +08:00
xiongziliang
790daee5ad
精简代码
2019-06-14 18:47:28 +08:00
xiongziliang
c7cc082d95
http文件鉴权支持自定义错误提示
2019-06-14 18:42:09 +08:00
xiongziliang
cfbdda0698
url参数变更后再次鉴权;hls播放鉴权提到httpsession类中实现
2019-06-14 15:19:02 +08:00
xiongziliang
e365824be2
修复multimap导致重复http头的bug
2019-06-13 18:39:57 +08:00
xiongziliang
42fe7e3dc5
服务器cookie不再强制关联path
2019-06-13 12:00:41 +08:00
xiongziliang
23d793c9c2
http客户端支持多cookie
2019-06-13 11:45:13 +08:00
xiongziliang
4662c1feb0
cookie过期时间为0时仅限本次访问鉴权
2019-06-13 09:24:53 +08:00
xiongziliang
20e62b103a
添加用户追踪事件
2019-06-12 18:55:23 +08:00
xiongziliang
080f2af4b4
常量改成string ,提供性能
2019-06-12 18:37:52 +08:00
xiongziliang
555601506b
添加访问http目录权限事件
2019-06-12 17:53:48 +08:00
xiongziliang
ce9a9188b2
优化rtsp服务器性能
2019-06-11 18:31:34 +08:00