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

2254 Commits

Author SHA1 Message Date
xiongziliang
a16b6cbc59 mp4切片逻辑提高对音视频交织性差的流的兼容性能 2022-03-20 14:52:15 +08:00
xiongziliang
b127d8c2a9 rtsp/GB28181随机端口，支持端口范围设置 2022-03-13 20:50:25 +08:00
xiongziliang
0f1120b8a6 on_publish hook新增多种选项 2022-03-12 14:34:48 +08:00
xiongziliang
1cf0a0cc20 bug fix 2022-03-12 14:02:12 +08:00
xiongziliang
4dc621e1bb 转协议选项抽象为ProtocolOption对象 2022-03-12 13:24:23 +08:00
xiongziliang
ed661b1cf1 修改无法删除hls目录的bug:#1485 2022-03-12 10:57:39 +08:00
xiongziliang
2d88115b3f 完善http直播url解析规则pr:#1467 2022-03-12 10:04:36 +08:00
xiongziliang
81c0635bf2 Merge branch 'add_schema_query_string' of github.com:mtdxc/ZLMediaKit 2022-03-12 09:53:07 +08:00
alexliyu7352
090593f67c
hls拉取索引文件避免循环重试 (#1474) 
当hls拉取索引文件失败时会触发重试.
但是play失败会调用一次rePlay, OnShutdow又会调用一次的rePlay.
由于m3u8文件非常小, 很大可能上短时间马上就会重试成功.
但是由于有两次的rePlay所以很可能再次析构了player, 又循环触发了更多的rePlay.

所以在播放成功后, 应该取消掉定时器
 2022-03-12 09:44:47 +08:00
alexliyu7352
4be3c349be
mpeg-ts解析丢弃不完整的包 (#1478) 
* 丢弃不正确的包

因为网络抖动或者拉流超时导致ts包不全.
这里丢弃掉有问题的包, 避免客户端解码中断

* Update TSDecoder.cpp

* 格式化代码

Co-authored-by: 夏楚 <771730766@qq.com>
 2022-03-12 09:41:15 +08:00
alexliyu7352
276f763c08
hls拉流动态计算切片超时时间 (#1477) 
* 动态计算切片超时时间

设置最大超时时间倍数和最小倍数,然后根据上一个切片的下载情况动态增加或者减少切片的超时时间.

* Update HlsPlayer.cpp
 2022-03-12 09:39:33 +08:00
alexliyu7352
b4241e12d5
hls拉流新增支持mime类型 (#1476) 
一些流服务器输出mime头有可能时audio/x-mpegurl, 所以这点的判断不能写的太死了.
 2022-03-12 09:36:28 +08:00
alexliyu7352
2c63916973
http-ts拉流新增支持mime类型(#1475) 
ts切片有些mime头并不是只有这两种,
比如youtube的ts切片头就是application/octet-stream
 2022-03-12 09:35:22 +08:00
cqm
4cfac989b3 支持?schema=rtmp/ts/fmp4格式 2022-03-03 19:45:47 +08:00
ziyue
d88fe077ed on_publish hook新增originType字段 2022-03-02 18:03:44 +08:00
ziyue
4af83cbe7c 修复ENABLE_MEM_DEBUG时编译失败的问题 2022-03-01 19:00:50 +08:00
xiongziliang
8324a9fe43 修复rtsp推流访问空指针的bug:#1456 2022-02-28 17:20:20 +08:00
xiongziliang
b82cd5a500 确保ntp时间戳获取失败时，webrtc rtp重传缓存列队长度正常 2022-02-27 01:02:54 +08:00
ziyue
b2bb37dc5c http: 修复32位系统下，下载3GB以上文件失败的问题: #1446 2022-02-23 17:03:13 +08:00
ziyue
4a7f5796ba 修复ts文件大于3GB时，获取文件大小异常的问题 2022-02-23 17:01:53 +08:00
ziyue
147ba6147c rtsp/rtp: 过滤干扰的rtp pt, 提高兼容性: #1445 2022-02-22 16:53:05 +08:00
ziyue
a15d59cf23 hls/ts播放器改成绝对时间戳:#1389 2022-02-22 11:45:41 +08:00
ziyue
cb00dbab0f 在track就绪前，强制split frame，防止sps pps未被获取到 2022-02-17 14:32:49 +08:00
ziyue
c997d11bd1 修复mp4点播时，sps pps太长导致获取失败的问题 2022-02-17 14:31:28 +08:00
xiongguangjie
9c45fca761
根据配置禁用mmap缓存 (#1429) 2022-02-17 10:35:10 +08:00
ziyue
304c898a3a 完善http文件获取相关代码 2022-02-16 16:58:13 +08:00
xiongziliang
45d9bcd5f4 ts解析失败时清空split缓存 2022-02-13 22:02:16 +08:00
xiongziliang
2e9d77e8e1 删除多余ts split代码 2022-02-13 21:53:21 +08:00
xiongziliang
83c1f29253 HLS: 解决hls断流重新生成后异常的bug 2022-02-13 21:06:32 +08:00
夏楚
e37982adee
优化hls媒体流注册与无人观看清理机制 (#1421) 
* 优化hls媒体流注册与无人观看清理机制

* 优化hls cookie管理

* bug fixed
 2022-02-12 16:24:55 +08:00
ziyue
a2b6344861 修复hls m3u8返回content-type异常的问题 2022-02-11 16:36:40 +08:00
ziyue
49fc17d7e0 hls m3u8文件直接通过内存读写 2022-02-11 16:21:19 +08:00
ziyue
642c9c075a 修复设置cookie错误的bug 2022-02-11 15:14:34 +08:00
ziyue
36f24527a4 http cookie减少互斥锁，优化性能 2022-02-11 14:33:11 +08:00
ziyue
c510f3765a 关闭小文件mmap预加载功能 2022-02-11 14:02:55 +08:00
ziyue
984715a018 修复获取共享mmap大小bug 2022-02-11 13:40:41 +08:00
ziyue
8188aa0d53 非必要不调用fopen 2022-02-11 13:10:56 +08:00
ziyue
3f6f26731a ts小文件先加载到内存 2022-02-11 12:49:03 +08:00
ziyue
96503967fc 屏蔽sendfile特性 2022-02-11 12:03:45 +08:00
ziyue
832c8d0d80 优化mktime性能问题 2022-02-11 11:54:12 +08:00
ziyue
d541ed2572 修复编译警告 2022-02-11 11:13:43 +08:00
ziyue
8338773767 hls/http-ts播放器新增性能测试模式 2022-02-11 11:11:30 +08:00
ziyue
91c0a563c3 确保mmap缓存记录表不膨胀 2022-02-10 21:23:50 +08:00
ziyue
dc672b14e3 确保32位系统支持超过4GB文件下载 2022-02-10 21:06:51 +08:00
ziyue
ba213346bc http文件服务器mmap方案采用共享方式 2022-02-10 20:57:23 +08:00
ziyue
72caa43c97 主动关闭的流不支持断流续推: #1401 2022-02-09 14:31:40 +08:00
ziyue
595182cebb Revert "当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401)" 
This reverts commit c97aa8483e.
 2022-02-09 14:21:35 +08:00
ziyue
81747d114e Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-02-09 11:48:51 +08:00
ziyue
cd1ca2c18c http-flv直播后缀由.flv改成.live.flv(目的是防止与flv文件下载冲突) 2022-02-09 11:48:15 +08:00
xiongziliang
8c30f11c17 修复windows下编译错误 2022-02-05 21:32:56 +08:00
xiongziliang
1dd3d6f1ac 忽略SIGPIPE信号 2022-02-05 20:39:24 +08:00
xiongziliang
0402646f7c 防止命名空间歧义 2022-02-05 01:01:29 +08:00
xiongziliang
4505f8ff4f 仅http协议开启sendfile优化 2022-02-05 01:00:48 +08:00
夏楚
d13e31c21b
尝试使用sendfile优化http文件服务器 (#1411) 2022-02-04 23:02:19 +08:00
夏楚
c72cf4cbcc
整理命名空间 (#1409) 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
 2022-02-02 20:34:50 +08:00
joshuafc
c97aa8483e
当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401) 
* 当调用mk_media_source_close(ptr, 1);时，主动注销流

主动调用上述函数时，期望不再等待RtmpSession.cpp:49处getPoller()->doDelayTask(continue_push_ms, [push_src]() { return 0; });捕获的指针，等待析构时反注册，而是立即反注册。

* `MediaSource::close`逻辑执行成功后执行`unregist`
 2022-01-27 14:56:18 +08:00
xiongziliang
3bf6ec8939 修复获取推流所有权导致引用计数紊乱的bug: #1397 2022-01-26 00:37:51 +08:00
ziyue
756ec1364b websocket客户端触发事件时确保对象强引用有效 
同时修复websocket客户端判断alive返回false的bug
 2022-01-25 11:44:51 +08:00
ziyue
4f27894302 添加bom头 2022-01-24 14:25:37 +08:00
ziyue
bc583e80b5 合并pr: #1391 2022-01-24 14:23:36 +08:00
ziyue
96061f1d36 Merge branch 'fix_rtc_g711_play' of github.com:ZLMediaKit/ZLMediaKit 2022-01-24 14:16:19 +08:00
xgj
341459fbf5 fix non rtc push rtc play g711 audio loss 2022-01-24 11:57:24 +08:00
ziyue
0ae9a8c8c8 Revert "添加递归溢出检测代码: #1363" 
This reverts commit 8937d9ea92.
 2022-01-24 11:38:36 +08:00
ziyue
80ecd2098e 修复编译警告 2022-01-24 10:48:15 +08:00
ziyue
100822f079 HLS: 修复时间戳回退导致不生成ts切片的bug: #1381, #1386 2022-01-21 18:00:44 +08:00
ziyue
3a8e954255 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-21 16:11:22 +08:00
ziyue
5007578202 hls/ts 播放器不做content-length严格限制 2022-01-21 16:10:27 +08:00
xiongziliang
f46d909bba 添加bom头，解决msvc编译问题 2022-01-20 22:49:47 +08:00
ziyue
bf191aa902 去除多余头文件 2022-01-20 15:42:53 +08:00
ziyue
88dc8d0a73 重写http客户端异常处理机制 2022-01-20 15:17:19 +08:00
ziyue
0f905b7333 优化http-ts播放器日志提示 2022-01-19 22:53:21 +08:00
ziyue
ee6ad66a6d HTTP: 重写http相关超时管理机制 2022-01-19 22:50:44 +08:00
ziyue
81cf93a2bf openRtpServer接口强制关闭reuse_port属性，防止端口冲突 2022-01-19 17:44:58 +08:00
ziyue
8937d9ea92 添加递归溢出检测代码: #1363 2022-01-17 14:47:55 +08:00
wangcker
e8b0993493
给openrtpserver接口添加enable_reuse参数 (#1372) 
* 修改rtpopen逻辑

* 给openrtpserver接口添加enable_reuse端口
 2022-01-14 21:53:01 +08:00
JayChen0519
a3e628449e
解决rtsp以MULTICAST方式拉流导致的奔溃问题 (#1368) 2022-01-14 13:14:30 +08:00
ziyue
75465311d9 修复丢包导致aac确实导致内存越界的bug: #1363 2022-01-14 13:09:47 +08:00
ziyue
d52fc4c31f Refine: 优化rtsp相关代码 2022-01-12 15:24:28 +08:00
ziyue
5b6ff0af27 完善mingw编译环境的适配 2022-01-11 14:09:57 +08:00
ziyue
fdcc29e0ed 修复http客户端复用header无法更新的bug: #1349 2022-01-11 10:44:49 +08:00
xiongziliang
60f11df1ea Revert "修复302跳转时, 如果跨域,header不正确的问题 (#1349)" 
This reverts commit 741b197f
 2022-01-11 09:18:36 +08:00
ziyue
412d280cd7 修复断连续推转协议失效的bug 2022-01-10 17:34:39 +08:00
ziyue
1dabc22347 修正错误注释 2022-01-10 17:00:25 +08:00
ziyue
f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
xiongziliang
262af8dfeb 修复编译问题 2022-01-09 15:12:23 +08:00
xiongziliang
7b04385bc8 合并http-ts播放器特性: #1336 2022-01-09 15:01:23 +08:00
xiongziliang
a4c69e61cd Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit 2022-01-09 14:54:21 +08:00
Dw9
819599ac25
修复获取帧率逻辑 (#1293) 2022-01-09 14:50:54 +08:00
alexliyu7352
741b197f31
修复302跳转时, 如果跨域,header不正确的问题 (#1349) 2022-01-09 14:32:59 +08:00
xiongziliang
f4d8eb4515 Rtmp: 获取h264sps/aac config失败时打印rtmp包内容 2022-01-08 16:28:13 +08:00
xiongziliang
6e445614b4 申请udp端口使用全局互斥锁保护，防止端口重复分配 2022-01-08 16:07:08 +08:00
ziyue
fd6e4b6342 MPEG: 优化http-ts性能: #1342 2022-01-06 15:30:09 +08:00
ziyue
5a592e6db6 优化循环池性能 2022-01-06 14:30:44 +08:00
alexliyu7352
3a0857ea31
当url并不是m3u8文件时, 避免拉取hls流出错 (#1341) 2022-01-05 20:01:19 +08:00
ziyue
ed4291bf3d Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-04 16:54:51 +08:00
ziyue
3ccd48e7a9 HLS: 返回全部切片数据后，链接断开不报错: #1332 2022-01-04 16:53:19 +08:00
alexliyu7352
6f9f93cb97
忘记删除很早很早以前注释掉的代码了 2022-01-04 15:46:48 +08:00
Alex
4792f6213b 新增Ts拉流 2022-01-04 15:32:59 +08:00
alexliyu7352
a441168004
修正不使用resetWhenReplay选项时, MediaSource会重复注册的问题 (#1330) 2022-01-04 14:47:41 +08:00
ziyue
389dd5f54b MPEG: 优化ts/ps muxer内存malloc和拷贝性能 2021-12-31 11:01:56 +08:00
ziyue
c0afcc48e5 malloc大内存警告环境变量改名为MEM_WARN_SIZE 2021-12-31 10:26:36 +08:00
xiongziliang
9cf6fea03e 修复编译问题 2021-12-30 22:12:36 +08:00
ziyue
84f3aa0748 完善内存统计并在malloc大内存时打印backtrace 2021-12-30 20:34:56 +08:00
ziyue
7f6be9e118 Refine: 消除编译警告 2021-12-30 15:28:27 +08:00
ziyue
940fe333db 尝试解决全局malloc统计相关变量提前销毁的bug 2021-12-30 15:28:27 +08:00
ziyue
1a6a62a304 malloc确保内存对齐 2021-12-29 20:57:35 +08:00
夏楚
15297a3ca3
添加内存malloc次数分布统计 (#1322) 2021-12-29 20:48:15 +08:00
ziyue
098ecf542a 部分代码移至第三方库 2021-12-29 14:18:52 +08:00
ziyue
5ae5c66256 Typo: 修复拼写错误 2021-12-28 21:29:00 +08:00
ziyue
89870190e9 MPEG: 整合复用ts/ps生成代码 2021-12-28 21:21:01 +08:00
ziyue
dce6b27f4f Http-FLV: http-flv直播采用绝对时间戳并支持las 2021-12-28 21:21:01 +08:00
ziyue
30b63ad656 Rtmp: rtmp分发改成绝对时间戳 2021-12-28 21:21:01 +08:00
ziyue
b749cfb8a3 TS: hls/http-ts 改为绝对时间戳 2021-12-28 21:21:01 +08:00
夏楚
878ce87329
支持线程内存malloc统计 (#1317) 2021-12-27 17:40:15 +08:00
xiongziliang
7f649b94e5 Rtmp: 修复openssl未开启导致链接失败的问题: #1301 2021-12-26 19:58:30 +08:00
xiongziliang
98d435ef50 Rtmp: 修复openssl未开启导致编译失败的问题: #1301 2021-12-26 18:34:55 +08:00
ziyue
3d44c772ac HLS: hls播放器解析ts失败时，清空数据以便恢复播放 2021-12-24 19:58:27 +08:00
ziyue
b1f68b9563 Splitter公开一些方法 2021-12-24 19:57:03 +08:00
ziyue
3cba8fca79 分包器缓存太多时主动清空数据 2021-12-24 17:47:15 +08:00
ziyue
5832de7ed8 HLS: ts分包器主动丢弃非法数据 2021-12-24 14:25:01 +08:00
ziyue
c25ff6400f HLS: hls播放解决播放下一个切片导致数据丢失的bug： #1294 2021-12-24 13:29:16 +08:00
ziyue
0bf75529a2 HTTP: 确保http请求结束后不再触发超时事件 2021-12-24 13:26:42 +08:00
ziyue
f89abfaf67 HTTP: 优化http客户端代码，并修复重定向时超时的bug: #1306 2021-12-24 11:25:55 +08:00
ziyue
4e01c29833 Rtmp: 优化复杂握手c0c1生成算法性能 2021-12-22 22:20:28 +08:00
ziyue
ab14585a81 Rtmp: rtmp客户端支持复杂握手，兼容某些rtmp服务器 2021-12-22 22:06:19 +08:00
ziyue
2e9ff3ed3c HLS: 修复hls直播ts/m3u8文件更新导致mmap失效，触发bus error的bug 2021-12-22 16:08:23 +08:00
ziyue
fe575af0d8 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-12-22 14:06:46 +08:00
ziyue
6a044f0726 HLS: 修复http客户端连接复用导致hls播放异常的bug: #1294 2021-12-22 14:03:05 +08:00
xiongziliang
ee13ca57c2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-12-17 22:40:42 +08:00
xiongziliang
0feac7c924 MP4: mp4开始点播确保MediaSource注册后再返回 2021-12-17 22:33:08 +08:00
alexliyu7352
0d5ef99724
http客户端支持简单验证协议 (#1289) 
* 加速track的准备速度

* 重命名为isAllTrackReady

* 无须缓冲帧时，暂不用转换为可缓存帧

* 支持简单验证协议

* 优化代码

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-17 17:48:05 +08:00
alexliyu7352
0b2e55429d
HLS: 加速track就绪速度 (#1286) 
* 加速track的准备速度

* 重命名为isAllTrackReady

* 无须缓冲帧时，暂不用转换为可缓存帧

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-17 14:47:17 +08:00
ziyue
5e2967d94a HLS: 合并hls m3u8刷新延时相关pr(#1281) 2021-12-17 11:40:54 +08:00
Alex
0c1159959c 拉去hls索引文件时, 不能仅仅只是按照m3u8文件中的分段时间来拉取, 这样在网络延迟的情况下很容易出现问题, 根据规范与ffmpeg中的实现修改如下 2021-12-17 02:04:28 +08:00
ziyue
120879df0f HTTP-FMP4: 修复http-fmp4直播秒开问题 2021-12-16 17:46:03 +08:00
ziyue
4291c31493 FMP4: http-fmp4直播提升流畅度 2021-12-16 12:09:49 +08:00
ziyue
f4b6a6bd40 MP4: 修复mp4解复用定时器精度太高时读取文件太快的bug 2021-12-16 10:50:31 +08:00
ziyue
b3dd440151 MP4Demuxer: MP4解复器支持获取track并添加frame输出回调 2021-12-15 20:51:26 +08:00
ziyue
283188bedb MP4Demuxer: 提高MP4解复用器接口灵活度 2021-12-15 20:50:35 +08:00
xiongguangjie
5bffc98541
hls 录像支持直播时移 (#1275) 
* hls live record support seek

* 调整代码风格

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-15 16:43:49 +08:00
xiongguangjie
50c6c2513d
修复rtsp tcp 推送到 rtsp-simple-server 失败的问题， (#1274) 
* for push rtsp  to rtsp-simple-server remeber annoce response sessionid and setup tcp add mode=record

* fix  push rtsp  to rtsp-simple-server over udp error add mode=record

* 优化代码

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-14 17:17:05 +08:00
Xiaofeng Wang
54367fef31
修正连 node ws 服务端失败问题 (#1262) 
Fix #1251

参考: https://datatracker.ietf.org/doc/html/rfc6455#section-4.2.1
Sec-WebSocket-Key base64 解码后长度应该是 16 字节.
 2021-12-08 14:17:34 +08:00
ziyue
e483424858 Refine: 删除无效代码 2021-12-01 22:14:28 +08:00
ziyue
c2b0f3c07b Refine: 修复hls播放器丢失首帧关键帧的问题 2021-12-01 22:09:05 +08:00
ziyue
8f60ec9900 Refine: 精简复用MediaSink相关代码 2021-12-01 21:38:31 +08:00
ziyue
84baf920c1 GB28181: ps解析失败触发断言时，丢弃所有数据 2021-12-01 17:02:06 +08:00
ziyue
78bcd9e868 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-11-30 18:05:06 +08:00
ziyue
4700ab77de Feature: 新增转协议超时等相关配置项( #1241) 2021-11-30 18:04:43 +08:00
xiongziliang
8b24088ab1 Refine: h264 rtp encoder不再过滤sei、aud帧 2021-11-28 21:15:03 +08:00
ziyue
3a99440296 Refine: 优化代码，减少拷贝 2021-11-23 15:59:18 +08:00
xiongziliang
97f7255f0a Performance: 使用循环池优化rtmp分发性能 2021-11-21 11:34:20 +08:00
xiongziliang
5404a5266a Performance: 使用循环池优化http-flv分发性能 2021-11-21 11:28:14 +08:00
ziyue
0b79de9d13 MediaSource: 禁止重复推送一个已经注册的流 2021-11-19 15:33:16 +08:00
ziyue
afdc5e4267 Refine: 优化tcp/udp服务器异常管理断开机制 2021-11-19 15:26:33 +08:00
ziyue
b13a0f5b79 Splitter: 全局限制内存使用量，防止内存溢出 2021-11-19 11:27:27 +08:00
ziyue
0281cb6a11 GB28181: 修复tcp推流时，流异常可能导致死循环的bug 2021-11-19 11:09:55 +08:00
xiongziliang
a5fc3b04d3 Refine: 删除多余代码 2021-11-13 00:31:32 +08:00
xiongziliang
b0343acf8c Refine: 提炼精简代码 2021-11-13 00:24:38 +08:00
ziyue
56b7a8a97b Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-11-10 15:30:57 +08:00
ziyue
ac41a1e933 RtmpPlay: 兼容无metadata的rtmp流 2021-11-10 15:25:24 +08:00
Xiaofeng Wang
9aaf3ce2ff
优先使用静态 payload type 值 (#1206) 2021-11-10 14:45:37 +08:00
ziyue
e51a78ebdc MediaSink: 确保收到数据后才触发TrackReady回调 2021-11-10 14:35:37 +08:00
ziyue
1513e9a857 Revert "忽略某些流声明存在却没实质数据的track" 
This reverts commit b42072405e.
 2021-11-10 14:18:55 +08:00
ziyue
6f92ef2f3b PlayerProxy: 减少一次MediaSink数据过滤，提高性能 2021-11-10 13:56:58 +08:00
ziyue
b7e187d7af Player: 添加kWaitTrackReady选项决定播放器是否等待所有track ready再回调 2021-11-10 13:56:04 +08:00
ziyue
e38f2253ff Demuxer: 解复用减少一次MediaSink的数据过滤 2021-11-10 13:44:29 +08:00
ziyue
2a8a6cac27 Refine: 优化MultiMediaSourceMuxer创建代码 2021-11-10 12:48:13 +08:00
ziyue
b892ac346f MediaSink: 优化静音音频相关逻辑性能 2021-11-10 12:41:06 +08:00
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
37fdb8d135 MediaSource: 继承改成私有 2021-11-10 11:38:54 +08:00
ziyue
ded5d83e04 MediaSink: 静音音频确保最后添加 2021-11-10 11:38:54 +08:00
ziyue
dad0c5e3cc MediaPusher: 抽象精简代码 2021-11-09 17:49:18 +08:00
ziyue
b96a2291eb MediaPusher: 整理代码风格 2021-11-09 15:45:31 +08:00
ziyue
b42072405e 忽略某些流声明存在却没实质数据的track 2021-10-28 10:53:07 +08:00
ziyue
5d56e86cfd 修复Windows上strptime不存在编译失败的问题 2021-10-27 17:14:16 +08:00
ziyue
e249a03dc2 修复调用stopSendRtp接口无法触发无人观看事件的bug：#1189 2021-10-27 13:40:59 +08:00
ziyue
350a0e3f81 防止内存越界 2021-10-27 13:26:53 +08:00
ziyue
0a3bcdab15 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-10-27 13:24:28 +08:00
ziyue
b438ecb88c 兼容不规范的aac rtsp推流 2021-10-27 13:23:27 +08:00
Dw9
bb9695a247
解决win32下大文件点播不了问题 (#1188) 2021-10-26 20:35:55 +08:00
ziyue
cd52a022f4 修复rtsp点播时长不准的bug 2021-10-25 19:39:45 +08:00
ziyue
fcfa13b0fe 适配最新zltoolkit 2021-10-22 16:43:34 +08:00
夏楚
19ebb03458
media-server使用原仓库并适配 (#1180) 
* remote media-server

* 适配第三方库media-server使用原仓库

* ireader/media-server库使用gitee镜像

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