Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

8.0

copilot/reliable-udp-projects

feature/async_write_file

feature/dynamic_library

feature/hls_record_disk

feature/log_context

feature/transcode

feature/transcode2

master

#1

#1

#10

#10

#11

#11

#12

#12

#13

#13

#14

#14

#15

#15

#16

#16

#17

#17

#18

#18

#19

#19

#2

#2

#20

#20

#21

#21

#22

#23

#23

#24

#24

#25

#25

#26

#26

#27

#27

#28

#28

#29

#29

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#4

#4

#5

#5

#6

#6

#7

#7

#8

#8

#9

#9

Mono Color

• 8f369061a8
  Merge pull request #397 from wasphin/feature/install-3rdpart-libraries 夏楚 2020-07-08 21:15:39 +0800
• 5cc684ac30
  Merge pull request #2 from xiongziliang/master lyg1949 2020-07-08 20:14:52 +0800
• b0e9f8c449 安装 C++ SDK 时也安装第三方库 wxf 2020-07-08 16:27:26 +0800
• 7bce212701 修复rtsp重复推流判断无效的bug:#394 xiongziliang 2020-07-08 12:42:05 +0800
• b2ff53037b http api新建的rtp服务器可以自动超时移除 xiongziliang 2020-07-08 10:25:30 +0800
• e58a63c528 优化代码 xiongziliang 2020-07-08 10:09:16 +0800
• 248b2d5cb9 完善GB28181推流 xiongziliang 2020-07-08 09:36:10 +0800
• 477f99b756 支持动态创建GB28181收流端口并可指定stream_id:#338 xiongziliang 2020-07-07 10:01:12 +0800
• 30260e5414 复用printSSRC函数 xiongziliang 2020-07-07 09:58:08 +0800
• 80d9f8ccaa 更新ps解析库，兼容不规范的ps流:#359 xiongziliang 2020-07-04 21:44:44 +0800
• cd5dd6ffd0 更新ps解析库，修复猜测编码格式错误的bug:#359 xiongziliang 2020-07-04 19:30:03 +0800
• 2be19ffb31 添加listRtpServer接口 xiongziliang 2020-07-02 22:26:38 +0800
• b603b8a68d 支持http api动态添加或关闭rtp服务器 xiongziliang 2020-07-02 22:23:43 +0800
• 236219c589
  Merge pull request #382 from wasphin/feature/use-pkgconfig-to-find-libav 夏楚 2020-07-02 18:20:01 +0800
• 55cc1d7391
  Merge pull request #383 from wasphin/feature/install-cxx-api 夏楚 2020-07-02 18:19:27 +0800
• 3c858a8351 添加媒体注册回调事件:#373 xiongziliang 2020-07-02 18:14:39 +0800
• dccb1e2a42 支持安装 C++ 库 wxf 2020-07-02 17:56:18 +0800
• e89e39704f 支持配置是否编译 api/tests/server wxf 2020-07-02 17:55:32 +0800
• ac320ddc09 支持在编译时开启/关闭部分特性 wxf 2020-07-02 16:58:21 +0800
• 5195475116 Merge remote-tracking branch 'origin/master' xiongziliang 2020-07-02 17:45:07 +0800
• 21edbb0ebe 更新ZLToolKit xiongziliang 2020-07-02 17:44:53 +0800
• 0c9dd568b0
  Merge pull request #1 from xiongziliang/master lyg1949 2020-07-02 17:10:53 +0800
• 2fee173d7a 优先使用 pkg-config 来查找 AV* 库 wxf 2020-06-30 21:45:17 +0800
• e24adfe995
  Update README_en.md 夏楚 2020-07-02 15:26:40 +0800
• 97c2297d2a
  Merge pull request #375 from wasphin/patch-2 夏楚 2020-06-30 21:21:04 +0800
• 92de6239f7
  Merge pull request #374 from wasphin/patch-1 夏楚 2020-06-30 21:20:01 +0800
• e679e74695 去除多余#include xiongziliang 2020-06-30 21:14:51 +0800
• bc606cf767
  子模块地址使用相对路径 Xiaofeng Wang 2020-06-30 21:13:52 +0800
• d2c052a673 优化代码逻辑 xiongziliang 2020-06-30 21:11:59 +0800
• 9e42772b48 rtmp aac config包没有负载 xiongziliang 2020-06-30 21:08:52 +0800
• 29077dcef4 rtmp播放成功时确保aac track处于ready状态 xiongziliang 2020-06-30 21:00:45 +0800
• 2b276efadd
  Remove self-included header Xiaofeng Wang 2020-06-30 20:15:22 +0800
• 41c75fb66a 新增是否开启浏览http目录的配置选项:#367 xiongziliang 2020-06-30 09:16:02 +0800
• bbcb4d41f7 修复ps解析误判为aac的bug xiongziliang 2020-06-29 11:55:13 +0800
• 038979b716 修改rtmp metadata codec由字符为整形,兼容比较老的rtmp服务器 xiongziliang 2020-06-28 21:49:08 +0800
• fd77398291 修复dts计算可能导致不同步的问题：#369 xiongziliang 2020-06-28 15:24:08 +0800
• f67e9fce9a 修复访问悬垂指针的可能 xiongziliang 2020-06-28 15:21:41 +0800
• e89caa2385 c sdk支持pcm输入:#363 xiongziliang 2020-06-24 11:18:04 +0800
• 575b84beee Merge branch 'master' of https://github.com/lyg1949/ZLMediaKit xiongziliang 2020-06-24 11:07:28 +0800
• 66c5a7169a 修复metadata中没duration导致播放失败的bug:#362 xiongziliang 2020-06-24 11:02:35 +0800
• 3d25ede46f 为API添加获取配置型内容的接口 zhlong 2020-06-24 09:50:35 +0800
• f0a538d37d
  实现输入PCM帧的接口 lyg1949 2020-06-24 08:54:15 +0800
• 791c773ae0
  增加输入PCM帧的接口 lyg1949 2020-06-24 08:52:45 +0800
• c49812fe73 Merge remote-tracking branch 'origin/master' xiongziliang 2020-06-19 10:19:56 +0800
• e76bc65243 修复开启转协议后，无人观看掐流延时不定期的bug xiongziliang 2020-06-19 10:19:42 +0800
• bb00759ce0
  Update README.md 夏楚 2020-06-17 16:15:15 +0800
• a46218965a
  Merge pull request #17 from xiongziliang/master baiyfcu 2020-06-17 15:58:41 +0800
• 05a65d4961 merge stamp baiyfcu 2020-06-17 15:51:02 +0800
• f881108dfe 更新第三方库 xiongziliang 2020-06-15 09:13:45 +0800
• 5f50441f43 降低第三方库头文件依赖性 xiongziliang 2020-06-12 18:17:49 +0800
• f03351a71a 修改dts生成逻辑 xiongziliang 2020-06-11 23:06:01 +0800
• efa92752c7 完善对高规格aac的支持 xiongziliang 2020-06-11 19:21:46 +0800
• b9006a90d4 优化rtmp推流时，aac config获取不完整的bug xiongziliang 2020-06-11 17:40:09 +0800
• 0e47dc94f9 aac config不再限制两个字节：#336 xiongziliang 2020-06-11 17:19:10 +0800
• 6b7e4f5f52 修复子进程日志路径固定的问题 xiongziliang 2020-06-11 09:22:28 +0800
• 9c646d1316 完善预设截图相关逻辑 xiongziliang 2020-06-10 10:50:37 +0800
• cecfe7ba54 截图api支持默认图片 xiongziliang 2020-06-10 10:33:48 +0800
• e946b3b3d2 Merge remote-tracking branch 'origin/master' xiongziliang 2020-06-09 14:22:15 +0800
• 7df092074d 修复m3u8起始阶段SEQUENCE错误的bug:#288 xiongziliang 2020-06-09 14:21:57 +0800
• 6091d87b5f
  Update README.md 夏楚 2020-06-09 10:14:35 +0800
• ca8e65f75f
  Update README.md 夏楚 2020-06-09 10:14:09 +0800
• 487c993baf 修复select全局限制文件描述符个数的bug:#333 xiongziliang 2020-06-08 20:03:51 +0800
• aca6c18e56 限制select文件描述符个数 xiongziliang 2020-06-08 19:21:45 +0800
• 72e8ab6ced 提高性能测试工具性能 xiongziliang 2020-06-08 18:59:32 +0800
• ab847ff575 完善代码 xiongziliang 2020-06-08 16:41:49 +0800
• a3089f9a7e 完善进程管理 xiongziliang 2020-06-08 16:26:55 +0800
• d0fc37db65 修复FFmpeg推流给第三方服务器时不重试的bug xiongziliang 2020-06-08 15:51:12 +0800
• 20e8e1d7ee 完善windows下子进程管理 xiongziliang 2020-06-08 15:49:32 +0800
• b08ea0fcc7 windows下子进程支持日志重定向、等待子进程推出、获取子进程退出码等特性 xiongziliang 2020-06-08 14:56:17 +0800
• 8ef8c91f2e 更新第三方库,解决rtp丢包导致无法解析的问题 xiongziliang 2020-06-04 16:17:41 +0800
• 09995a7ed8 完善websocket c api xiongziliang 2020-06-04 16:17:03 +0800
• fe095a4117 优化日志重定向代码 xiongziliang 2020-06-01 11:17:50 +0800
• 974260156e 防止误报警告日志 xiongziliang 2020-05-30 18:33:28 +0800
• b7049b1407 精简代码 xiongziliang 2020-05-30 14:43:08 +0800
• aeb2f910c1 release编译时修复assert宏相关警告 xiongziliang 2020-05-30 13:52:09 +0800
• 932da46c3a 更新第三方库 xiongziliang 2020-05-30 12:01:44 +0800
• 31ad2caa6b 使用抛异常替代asset，提高代码稳定性 xiongziliang 2020-05-30 11:49:36 +0800
• fb4435fca9 rtp推流解析出frame才刷新保活计时器 xiongziliang 2020-05-30 10:16:15 +0800
• de96a4f0c8 优化代码 xiongziliang 2020-05-28 18:19:39 +0800
• 406c5477e0 无metadata且不能获取Track的rtmp确保能注册 xiongziliang 2020-05-28 18:01:03 +0800
• 41509800bc 完善对无metadata的rtmp流的兼容性 xiongziliang 2020-05-28 17:03:12 +0800
• e7f263b046 Merge remote-tracking branch 'origin/master' xiongziliang 2020-05-28 12:44:39 +0800
• ebc1ee2c6e 代码优化 xiongziliang 2020-05-28 12:44:25 +0800
• 2050ed9db6
  Update README.md 夏楚 2020-05-27 14:59:49 +0800
• 57fce29482
  Update README.md 夏楚 2020-05-27 14:52:48 +0800
• 0548256c30 合并写缓存优化对rtp的支持 xiongziliang 2020-05-27 11:25:56 +0800
• dea36cfc84 优化合并写逻辑，确保GOP缓存第一帧为关键帧并确保音视频数据的交织性 xiongziliang 2020-05-27 11:09:02 +0800
• a7bcfd566b 平滑动播放hls xiongziliang 2020-05-26 23:19:13 +0800
• 53ca43fb7d 提高性能 xiongziliang 2020-05-26 21:04:53 +0800
• 7b90daab24 修复h264/h265 prefixSize计算错误的bug xiongziliang 2020-05-26 17:00:51 +0800
• 7d8dbb2a4b 修复websocket客户端相关bug:#311 xiongziliang 2020-05-26 12:11:44 +0800
• 876111698e 优化时间戳相关代码 xiongziliang 2020-05-26 10:30:39 +0800
• ff7914e441 修改MediaSource相关接口 xiongziliang 2020-05-26 10:11:58 +0800
• eddb5adcb2 修复配置文件错误注释 xiongziliang 2020-05-26 09:18:34 +0800
• e063cb3a00 兼容一些不规范的rtsp流 xiongziliang 2020-05-25 21:54:43 +0800
• 0626f9a2bf 修复拼写错误 xiongziliang 2020-05-25 18:33:42 +0800
• 8d1801339c 优化rtsp鉴权事件 xiongziliang 2020-05-25 18:22:21 +0800
• 20d3757986 http-flv/ws-flv先触发on_play再触发on_stream_not_found xiongziliang 2020-05-25 17:38:36 +0800
• 68d910e229 限制rtsp/rtmp推流url合法性 xiongziliang 2020-05-25 16:40:41 +0800
• 5ae887a279 websocket客户端销毁时主动发送close信令: #311 xiongziliang 2020-05-25 14:36:58 +0800