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 |
|
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 |
|