amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-12-05 09:21:59 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,833 Commits 16 Branches 0 Tags 226 MiB
744c1427e8
Commit Graph

3833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lyg1949
f420509c5c
修复点播rtmp时多出一个后缀名的bug 
vlc，mpv等播放rtmp时的url规则与代码中注释的不同，导致出现2个后缀名
 2020-07-15 14:17:18 +08:00
lyg1949
2d89322b8e
Merge pull request #5 from xiongziliang/master 
update from origin
 2020-07-14 17:29:26 +08:00
xiongziliang
c507e8a772 完善对系统时间戳跳变的支持 2020-07-14 15:03:47 +08:00
xiongziliang
971a4d765d 修复修改系统时间戳导致定时器不精准的bug 2020-07-13 14:38:45 +08:00
xiongziliang
0bb593f817 rtp推流无人观看时，自动关闭端口：#410 2020-07-14 09:50:06 +08:00
xiongziliang
58fb88eac0 添加postman相关配置文件 2020-07-11 23:17:36 +08:00
xiongziliang
c66e5dcdb1 更新第三方库，修复ps rtp解包相关问题:#388 2020-07-11 21:56:39 +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
d6d861c401 openRtpServer接口不允许添加重复的stream_id 2020-07-09 10:57:17 +08:00
xiongziliang
363673dd00 完善getRtpInfo接口 2020-07-09 10:41:17 +08:00
xiongziliang
4b39fd487d 动态创建rtp端口采用stream_id为索引 2020-07-09 10:38:57 +08:00
lyg1949
ade89bdb4d
Merge pull request #3 from xiongziliang/master 
update code
 2020-07-09 08:24:26 +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
夏楚
8f369061a8
Merge pull request #397 from wasphin/feature/install-3rdpart-libraries 
安装 C++ SDK 时也安装第三方库
 2020-07-08 21:15:39 +08:00
lyg1949
5cc684ac30
Merge pull request #2 from xiongziliang/master 
Merge from zlmediakit
 2020-07-08 20:14:52 +08:00
wxf
b0e9f8c449 安装 C++ SDK 时也安装第三方库 2020-07-08 16:27:26 +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
xiongziliang
80d9f8ccaa 更新ps解析库，兼容不规范的ps流:#359 2020-07-04 21:44:44 +08:00
xiongziliang
cd5dd6ffd0 更新ps解析库，修复猜测编码格式错误的bug:#359 2020-07-04 19:30:03 +08:00
xiongziliang
2be19ffb31 添加listRtpServer接口 2020-07-02 22:26:38 +08:00
xiongziliang
b603b8a68d 支持http api动态添加或关闭rtp服务器 2020-07-02 22:23:43 +08:00
夏楚
236219c589
Merge pull request #382 from wasphin/feature/use-pkgconfig-to-find-libav 
优先使用 pkg-config 来查找 AV* 库
 2020-07-02 18:20:01 +08:00
夏楚
55cc1d7391
Merge pull request #383 from wasphin/feature/install-cxx-api 
支持单独安装 C++ 库
 2020-07-02 18:19:27 +08:00
xiongziliang
3c858a8351 添加媒体注册回调事件:#373 2020-07-02 18:14:39 +08:00
wxf
dccb1e2a42 支持安装 C++ 库 2020-07-02 18:03:34 +08:00
wxf
e89e39704f 支持配置是否编译 api/tests/server 2020-07-02 18:03:28 +08:00
wxf
ac320ddc09 支持在编译时开启/关闭部分特性 2020-07-02 18:03:17 +08:00
xiongziliang
5195475116 Merge remote-tracking branch 'origin/master' 2020-07-02 17:45:07 +08:00
xiongziliang
21edbb0ebe 更新ZLToolKit 2020-07-02 17:44:53 +08:00
lyg1949
0c9dd568b0
Merge pull request #1 from xiongziliang/master 
获取zlmediakit的最新提交
 2020-07-02 17:10:53 +08:00
wxf
2fee173d7a 优先使用 pkg-config 来查找 AV* 库 
部分主机上 ffmpeg 安装路径不标准, 默认查找方式不方便适应该方式
 2020-07-02 16:21:27 +08:00
夏楚
e24adfe995
Update README_en.md 2020-07-02 15:26:40 +08:00
夏楚
97c2297d2a
Merge pull request #375 from wasphin/patch-2 
子模块地址使用相对路径
 2020-06-30 21:21:04 +08:00
夏楚
92de6239f7
Merge pull request #374 from wasphin/patch-1 
Remove self-included header
 2020-06-30 21:20:01 +08:00
xiongziliang
e679e74695 去除多余#include 2020-06-30 21:14:51 +08:00
Xiaofeng Wang
bc606cf767
子模块地址使用相对路径 
子模块地址使用相对路径。
* 统一服务器，即主库通过 github 下载则子库也通过 github 下载；
* 也方便做 git 镜像，在自建 git 服务器上镜像后访问也更方便；
 2020-06-30 21:13:52 +08:00
xiongziliang
d2c052a673 优化代码逻辑 2020-06-30 21:11:59 +08:00
xiongziliang
9e42772b48 rtmp aac config包没有负载 2020-06-30 21:08:52 +08:00
xiongziliang
29077dcef4 rtmp播放成功时确保aac track处于ready状态 2020-06-30 21:00:45 +08:00
Xiaofeng Wang
2b276efadd
Remove self-included header 2020-06-30 20:15:22 +08:00