amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-30 07:26:53 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
2,020 Commits 16 Branches 0 Tags 225 MiB
e7569c8cbc
Commit Graph

1167 Commits

Author SHA1 Message Date
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
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