ziyue
|
1ce841ce42
|
MediaSink: 修复静音音频添加逻辑bug
|
2021-11-10 12:04:32 +08:00 |
|
ziyue
|
817542cd0c
|
Mutex: 删除一些不必要的互斥锁
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
143979f354
|
Stamp: 兼容时间戳跳跃的情况
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
fdfde17ec7
|
Demuxer/Player: 修改解复用与播放器底层逻辑,确保触发播放成功回调时不丢帧
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
ded5d83e04
|
MediaSink: 静音音频确保最后添加
|
2021-11-10 11:38:54 +08:00 |
|
ziyue
|
e249a03dc2
|
修复调用stopSendRtp接口无法触发无人观看事件的bug:#1189
|
2021-10-27 13:40:59 +08:00 |
|
ziyue
|
4067f2beb6
|
ps rtp推流接口(startSendRtp)支持推送本地mp4录像
|
2021-10-21 10:21:52 +08:00 |
|
ziyue
|
cf1adf1c92
|
兼容一些不规范的rtsp流
|
2021-10-20 10:58:05 +08:00 |
|
ziyue
|
8aa2d0ce07
|
add RTC_SCHEMA macros
|
2021-10-19 15:22:48 +08:00 |
|
ziyue
|
488026c0b8
|
删除多余代码
|
2021-10-16 16:58:13 +08:00 |
|
ziyue
|
f5f58196b5
|
修改常量命名
|
2021-10-16 16:58:03 +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
|
dd81497e5c
|
修复rtp pts 时间戳回退导致ntp时间戳计算异常的bug:#1152
|
2021-10-13 15:52:12 +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 |
|
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 |
|
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 |
|
ziyue
|
83ee396405
|
全局关闭音频时,加快单视频流注册速度
|
2021-09-14 16:27:11 +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
|
5f2e4ff2c0
|
修复http文件目录相关bug:#1083
|
2021-09-03 17:58:23 +08:00 |
|
ziyue
|
415bc95dda
|
完善ntp时间戳计算逻辑
|
2021-09-02 21:39:10 +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
|
04bf829540
|
非rtsp协议减少一帧延时
|
2021-08-30 18:05:21 +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
|
b3ad0891e6
|
修复除0的bug
|
2021-08-22 15:13:20 +08:00 |
|
ziyue
|
10522e4ea5
|
完善getOriginUrl接口
|
2021-08-16 17:31:13 +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
|
018fa40946
|
打印codec信息时,打印url信息
|
2021-08-05 14:49:52 +08:00 |
|
ziyue
|
42ef41cb58
|
修复rtp时间戳映射机制相关bug: #998
|
2021-07-22 20:31:02 +08:00 |
|
ziyue
|
566a49e227
|
修复getMediaTracks接口相关功能
|
2021-07-20 13:15:57 +08:00 |
|
ziyue
|
4b34e58d3c
|
移除MultiMuxerPrivate对象,修复rtp发送时无sps pps帧的问题
|
2021-07-20 12:42:53 +08:00 |
|
wxf
|
ece7186e6c
|
改为按 Session 查找媒体源以支持 TCP/UDP Session
|
2021-07-15 11:25:48 +08:00 |
|
ziyue
|
09d7670fdf
|
收到sender report包前,通过系统时间戳产生ntp时间戳
|
2021-07-14 21:41:13 +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 |
|
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
|
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
|
307be4339f
|
Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test
|
2021-06-23 17:32:09 +08:00 |
|
ziyue
|
e8c9666af0
|
支持hls直播文件延时删除: #913
|
2021-06-23 10:30:58 +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
|
a09de23271
|
修复调用mk_media_stop_send_rtp函数导致崩溃的bug
|
2021-06-16 10:14:24 +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 |
|
xiongziliang
|
9f223bc7a2
|
Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev
|
2021-05-22 10:25:05 +08:00 |
|
xiongziliang
|
7067472a18
|
转协议支持全局关闭音频:#883
|
2021-05-22 10:17:52 +08:00 |
|
xia-chu
|
3cc640f96e
|
删除无效配置
|
2021-04-30 11:44:06 +08:00 |
|
xia-chu
|
88e1c323c3
|
删除无效配置
|
2021-04-30 09:24:09 +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
|
a28c76a33c
|
限制未就绪状态track的最大帧缓存数量
|
2021-04-26 14:58:06 +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 |
|
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 |
|
xia-chu
|
155c59e17e
|
添加rtc类型的推流
|
2021-04-07 18:17:49 +08:00 |
|
xiongziliang
|
c0f4899950
|
录制接口支持指定切片时间大小:#747
|
2021-03-07 10:41:57 +08:00 |
|
xiongziliang
|
56f044f8ed
|
修复线程安全bug
|
2021-02-28 20:58:25 +08:00 |
|
xia-chu
|
0c728827aa
|
添加全局内存统计功能
|
2021-02-21 21:28:17 +08:00 |
|
xia-chu
|
62ba87dd0f
|
优化frame性能及整理代码
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
b0e1d5d6aa
|
重写rtp去冲突逻辑
|
2021-02-06 20:10:32 +08:00 |
|
xiongziliang
|
ddd3438fc3
|
添加bom头
|
2021-01-31 20:46:55 +08:00 |
|
xiongziliang
|
070bf19cb5
|
重写rtp框架
|
2021-01-31 20:03:51 +08:00 |
|
xiongziliang
|
5c6560f55d
|
重写rtcp框架
|
2021-01-31 19:33:33 +08:00 |
|
xiongziliang
|
aa45590c13
|
添加对象统计接口
|
2021-01-23 09:44:37 +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 |
|
xia-chu
|
0e3c21932d
|
修复编译失败的问题
|
2021-01-03 15:55:26 +08:00 |
|
xiongziliang
|
c69e9b8ec1
|
主动发送rtp接口(startSendRtp)支持返回本地端口: #538
|
2021-01-02 20:43:02 +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 |
|
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 |
|
xiongziliang
|
55cf411c1e
|
支持bitrate
|
2020-12-05 12:22:17 +08:00 |
|
xiongziliang
|
c4c978be44
|
去除编译警告
|
2020-11-29 09:34:02 +08:00 |
|
xiongziliang
|
e7569c8cbc
|
删除多余日志
|
2020-11-29 09:33:49 +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
|
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
|
ab9a605a66
|
优化代码结构
|
2020-10-24 23:33:13 +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
|
02c4aa3f4b
|
优化代码
|
2020-10-24 23:28:25 +08:00 |
|
xiongziliang
|
130c411ae4
|
修复添加track太晚导致的bug: #528
|
2020-10-20 10:21:35 +08:00 |
|
xiongziliang
|
dfaa8b540c
|
使用临时变量和std::move减少智能指针的拷贝构造
|
2020-10-10 18:23:25 +08:00 |
|
xiongziliang
|
a1de3bfd30
|
添加流创建时间、在线时间
|
2020-10-01 18:57:15 +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
|
416d21df36
|
返回值去除std::move
|
2020-09-21 14:32:56 +08:00 |
|
xiongziliang
|
08a5891bdc
|
修复url解析相关bug
|
2020-09-20 20:15:39 +08:00 |
|
xiongziliang
|
d971eccf92
|
新增支持HTTP-fMP4 WebSocket-fMP4直播
|
2020-09-20 19:45:37 +08:00 |
|
xiongziliang
|
c76930e3cd
|
支持http-ts/websocket-ts直播
|
2020-09-20 00:21:46 +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
|
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 |
|
xiongziliang
|
3b5053af50
|
修复关闭HLS后,编译失败的问题
|
2020-09-12 19:46:58 +08:00 |
|
xiongziliang
|
be1e872f0c
|
完善按需转协议(包括hls)
|
2020-09-12 19:20:18 +08:00 |
|
xiongziliang
|
9e26a02fb1
|
实现rtsp/rtmp按需转协议功能
|
2020-09-12 19:09:56 +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
|
51ae8d4083
|
复用忽略协议查找流的相关代码
|
2020-09-06 18:19:54 +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
|
636068b2b8
|
精简代码,改善代码结构
|
2020-09-06 17:52:33 +08:00 |
|
xiongziliang
|
eca9236955
|
优化与拦截代码
|
2020-09-06 17:52:07 +08:00 |
|
xiongziliang
|
84cfe66da0
|
修复由于音视频同步导致时间戳回退的问题
|
2020-08-30 09:15:39 +08:00 |
|
xiongziliang
|
fbd711a6bb
|
整理代码
|
2020-08-30 10:48:34 +08:00 |
|
xiongziliang
|
f23e117751
|
MultiMediaSourceMuxer默认能处理大部分事件
|
2020-08-08 12:20:13 +08:00 |
|
xiongziliang
|
a22f97c777
|
rtsp/rtmp/mp4支持opus并整理代码
|
2020-08-01 10:22:12 +08:00 |
|
xiongziliang
|
f84b3d90b4
|
流未找到事件中,可以立即返回播放失败: #417
|
2020-07-16 16:00:31 +08:00 |
|
xiongziliang
|
3c858a8351
|
添加媒体注册回调事件:#373
|
2020-07-02 18:14:39 +08:00 |
|
xiongziliang
|
41c75fb66a
|
新增是否开启浏览http目录的配置选项:#367
|
2020-06-30 09:16:02 +08:00 |
|
xiongziliang
|
fd77398291
|
修复dts计算可能导致不同步的问题:#369
|
2020-06-28 15:24:08 +08:00 |
|
xiongziliang
|
e76bc65243
|
修复开启转协议后,无人观看掐流延时不定期的bug
|
2020-06-19 10:19:42 +08:00 |
|
xiongziliang
|
f03351a71a
|
修改dts生成逻辑
|
2020-06-11 23:06:01 +08:00 |
|
xiongziliang
|
31ad2caa6b
|
使用抛异常替代asset,提高代码稳定性
|
2020-05-30 11:49:36 +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
|
7b90daab24
|
修复h264/h265 prefixSize计算错误的bug
|
2020-05-26 17:00:51 +08:00 |
|
xiongziliang
|
876111698e
|
优化时间戳相关代码
|
2020-05-26 10:30:39 +08:00 |
|
xiongziliang
|
ff7914e441
|
修改MediaSource相关接口
|
2020-05-26 10:11:58 +08:00 |
|
xiongziliang
|
06d61cf195
|
添加全局时间戳覆盖逻辑
|
2020-05-25 12:07:38 +08:00 |
|
xiongziliang
|
477475a60f
|
批量添加bom头、批量替换tab字符
|
2020-05-18 15:31:49 +08:00 |
|
xiongziliang
|
1970f6014e
|
优化音视频同步
|
2020-05-15 18:08:54 +08:00 |
|
xiongziliang
|
625d7e30c0
|
整理和精简代码
|
2020-05-11 22:33:10 +08:00 |
|
xiongziliang
|
a4d7b3463e
|
rtmp播放时,取相对时间戳逻辑确保时间戳同步
|
2020-05-06 18:54:28 +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
|
f9df7f5217
|
去除ultraLowDelay配置项
|
2020-04-29 11:08:43 +08:00 |
|
xiongziliang
|
7565a20695
|
startRecord API with "customized_path" #279
|
2020-04-28 15:24:08 +08:00 |
|
xiongziliang
|
75cc34814f
|
保证不丢帧
|
2020-04-26 15:19:32 +08:00 |
|
xiongziliang
|
b2fe3cd05d
|
加锁
|
2020-04-26 11:25:25 +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
|
eda7a59f3c
|
统一事件参数类型
|
2020-04-23 22:04:59 +08:00 |
|
xiongziliang
|
b6946a5968
|
事件广播触发者改成SockInfo对象
|
2020-04-23 21:38:44 +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
|
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
|
99a55ddaaa
|
添加合并写功能
|
2020-04-09 16:19:03 +08:00 |
|
baiyfcu
|
340629cdc6
|
添加对g711A/U rtsp支持相关文件,api添加windows静态库编译选项,g711 RTMP支持尚未修改
|
2020-04-08 15:42:52 +08:00 |
|
xiongziliang
|
0fc1499643
|
添加性能测试模式
|
2020-04-08 11:16:09 +08:00 |
|
xiongziliang
|
1352e159f1
|
优化性能
|
2020-04-07 10:26:07 +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
|
7019e4717c
|
整理授权协议
|
2020-04-04 20:30:09 +08:00 |
|
xiongziliang
|
11420b868b
|
整理代码
|
2020-04-04 19:55:11 +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
|
42eece5b9a
|
mp4点播无人观看时自动关闭
|
2020-04-03 22:39:44 +08:00 |
|
xiongziliang
|
46be8a38e7
|
重写MP4点播
|
2020-04-03 20:45:58 +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
|
e4e5400641
|
优化虚拟主机相关
|
2020-03-12 12:47:15 +08:00 |
|
xiongziliang
|
f76a203768
|
完善注释
|
2020-03-10 23:22:48 +08:00 |
|
xiongziliang
|
10884340b0
|
优化rtp推流相关代码
|
2020-03-08 21:19:20 +08:00 |
|
xiongziliang
|
c77f82f02c
|
尝试添加rtp类型自动判断逻辑
|
2020-03-04 22:25:00 +08:00 |
|
xiongziliang
|
f384f5e025
|
解决死锁问题
|
2020-03-04 21:57:31 +08:00 |
|
xiongziliang
|
e6eee321ea
|
优化临界状态丢起始帧的问题
|
2020-02-27 12:31:57 +08:00 |
|
xiongziliang
|
d60101b93c
|
优化单Track情况下等待3秒的情况
|
2020-02-25 14:59:40 +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
|
6a97fcb3de
|
媒体注册、重置事件改成同步触发
|
2020-02-01 22:57:48 +08:00 |
|
xiongziliang
|
4470f2e427
|
添加addTrackCompleted方法,缩短流注册延时
|
2020-01-22 19:09:53 +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
|
5d2864cff2
|
优化DevChannel内存拷贝问题
|
2020-01-08 12:15:59 +08:00 |
|
xiongziliang
|
57c5d2963a
|
优化DevChannel内存拷贝问题
|
2020-01-08 12:14:27 +08:00 |
|
Gemfield
|
e31c1ee207
|
Add optional customized_path parameter for startRecord
|
2020-01-02 12:47:12 +08:00 |
|
xiongziliang
|
e91c26c052
|
实现hls的流量汇报事件
|
2019-12-29 15:38:29 +08:00 |
|
xiongziliang
|
97ad062dcf
|
默认关闭rtmp时间戳覆盖
|
2019-12-29 12:16:02 +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
|
94806b2cd6
|
初步实现hls播放器个数计数
|
2019-12-28 16:48:11 +08:00 |
|
xiongziliang
|
20d56b713f
|
性能优化
|
2019-12-28 13:39:25 +08:00 |
|
xiongziliang
|
aaab52c94f
|
文件根目录httpRoot改成www,并且自动复制到相应目录
|
2019-12-27 12:15:38 +08:00 |
|
xiongziliang
|
56397628da
|
修复未初始化导致的bug
|
2019-12-26 19:36:57 +08:00 |
|
xiongziliang
|
f7db9d3690
|
默认关闭虚假主机
|
2019-12-26 12:23:38 +08:00 |
|
xiongziliang
|
3830792c57
|
整理MediaSource派生类
修复转协议或录制时忽然Track的问题
|
2019-12-26 11:53:19 +08:00 |
|
xiongziliang
|
e663ddd9a6
|
简化事件参数
|
2019-12-24 14:08:16 +08:00 |
|
xiongziliang
|
2da0c884a1
|
添加kBroadcastHttpBeforeAccess事件,拦截http文件下载事件
|
2019-12-23 12:47:04 +08:00 |
|
xiongziliang
|
5322a5761b
|
修复时间戳跳跃可能导致的问题
|
2019-12-16 16:17:52 +08:00 |
|
xiongziliang
|
3f12c0ccde
|
修复时间戳覆盖的累积误差
|
2019-12-16 15:49:52 +08:00 |
|
xiongziliang
|
0d9bdec182
|
支持rtp代理服务器
|
2019-12-06 11:54:10 +08:00 |
|
xiongziliang
|
f581f0f2a7
|
优化精简录制相关代码
|
2019-12-05 10:47:23 +08:00 |
|
xiongziliang
|
6eb4d5916d
|
修复bug
|
2019-12-04 19:19:03 +08:00 |
|
xiongziliang
|
b3fcb4c038
|
重写mp4录制驱动机制
|
2019-12-04 18:36:30 +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
|
c55f26fba7
|
整理MediaSink
|
2019-12-03 12:32:57 +08:00 |
|
xiongziliang
|
cadff93d4d
|
1、hls cookie改成60秒有效期并且访问时刷新cookie
2、去除keep-alive下最大请求次数限制
|
2019-11-30 14:29:44 +08:00 |
|
xiongziliang
|
0d42aab9e7
|
修复FFmpeg拉流代理无法通过close_stream接口关闭的bug
|
2019-11-18 12:07:11 +08:00 |
|
xiongziliang
|
5a1503008f
|
完善注释
|
2019-11-08 15:55:26 +08:00 |
|