amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-31 08:39:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,134 Commits 16 Branches 0 Tags 224 MiB
2b3ce0ec63
Commit Graph

2134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
380a0204b1 替换docker镜像 2020-09-20 10:09:13 +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
xiongziliang
00a7414f67 Merge remote-tracking branch 'origin/master' 2020-09-14 14:39:27 +08:00
xiongziliang
84b84ab979 update readme 2020-09-14 14:39:10 +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
夏楚
f903ffeb4a
Update README.md 2020-09-12 22:00:31 +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
夏楚
28d73db9f7
Merge pull request #478 from v354412101/master 
忽略AUD帧 #477
 2020-09-12 18:40:06 +08:00
Zhou Weimin
01284323eb 忽略AUD帧; 2020-09-12 13:45:16 +08:00
夏楚
c75c8f3806
Merge pull request #471 from doodoocoder/master 
当用pkg-config找avcodec与avutil时，应该就AVCODEC_INCLUDE_DIRS,AVUTIL_INCLUDE_DIRS
 2020-09-11 10:01:03 +08:00
夏楚
f2f41e63bb
Merge pull request #474 from Colibrow/patch-1 
修复编译问题
 2020-09-11 09:54:28 +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
doodoocoder
2ae9d7c2ef
当用pkg-config找avcodec与avutil时，应该就AVCODEC_INCLUDE_DIRS,AVUTIL_INCLUDE_DIRS 
当用pkg-config找avcodec与avutil时，应该就AVCODEC_INCLUDE_DIRS,AVUTIL_INCLUDE_DIRS而不是AVCODEC_INCLUDE_DIR,AVUTIL_INCLUDE_DIR
 2020-09-10 13:35:35 +08:00
xiongziliang
9c96f8d31a 确保PSRtpSender对象的线程安全 2020-09-06 21:09:19 +08:00
xiongziliang
040c132fb6 优化stopSendRtp接口返回值 2020-09-06 18:24:48 +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
d0f17559cb 更新ZLToolKit 2020-09-06 18:01:47 +08:00
xiongziliang
d90d25acb9 支持GB推流客户端 
添加2个相关工程
 2020-09-06 17:59:18 +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