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

• e4e5400641 优化虚拟主机相关 xiongziliang 2020-03-12 12:47:15 +0800
• e90319a1f2 http服务器支持OPTIONS命令 xiongziliang 2020-03-11 20:58:41 +0800
• 2b592780ad 修复aac rtp解包内存越界的bug xiongziliang 2020-03-11 18:52:28 +0800
• f76a203768 完善注释 xiongziliang 2020-03-10 23:22:48 +0800
• 038617a6c4 新增拉流代理源相关api xiongziliang 2020-03-10 22:56:56 +0800
• 891b86e7ea 新增拉流代理源相关api xiongziliang 2020-03-10 22:55:19 +0800
• b3554fb721 消除编译警告 xiongziliang 2020-03-09 16:04:34 +0800
• 800b0d81f3 完善readme xiongziliang 2020-03-08 22:29:31 +0800
• 502e3bff5f 解决ps rtp解包问题 xiongziliang 2020-03-08 22:10:37 +0800
• 10884340b0 优化rtp推流相关代码 xiongziliang 2020-03-08 21:19:20 +0800
• ae45c24fa3 解决ts误判的问题 xiongziliang 2020-03-07 16:09:57 +0800
• 87d4a8ed78
  Merge pull request #10 from xiongziliang/master baiyfcu 2020-03-06 14:54:21 +0800
• 069bde09c1 支持ts rtp流 xiongziliang 2020-03-06 13:00:06 +0800
• d35f1d0bfe 优化接口命名 xiongziliang 2020-03-06 11:11:27 +0800
• a89e81d3f3 完善日志 xiongziliang 2020-03-05 18:04:34 +0800
• 448f6fa3c7 优化rtp代理超时管理 xiongziliang 2020-03-05 11:36:31 +0800
• c77f82f02c 尝试添加rtp类型自动判断逻辑 xiongziliang 2020-03-04 22:25:00 +0800
• f384f5e025 解决死锁问题 xiongziliang 2020-03-04 21:57:31 +0800
• 6cc56a758a Merge remote-tracking branch 'origin/master' xiongziliang 2020-02-29 10:28:20 +0800
• 899dcc7386 修复拼写错误 xiongziliang 2020-02-29 10:27:30 +0800
• a245e6bec2
  Update README.md 夏楚 2020-02-28 23:08:44 +0800
• 0a4f2ad42c
  Update README.md 夏楚 2020-02-28 22:55:47 +0800
• 1e53500eb0 mk_media接口支持无人观看事件 xiongziliang 2020-02-28 17:53:21 +0800
• 109fab2cb1 RTP代理支持完整的事件 xiongziliang 2020-02-28 16:25:14 +0800
• 5acdf1f789 完善注释 xiongziliang 2020-02-27 15:48:52 +0800
• e6eee321ea 优化临界状态丢起始帧的问题 xiongziliang 2020-02-27 12:31:57 +0800
• 38584a7478 添加mk_media_init_complete接口 xiongziliang 2020-02-27 11:40:38 +0800
• a0001bf2f4 优化日志友好度 xiongziliang 2020-02-25 19:00:22 +0800
• 86b053db3b 优化代码 xiongziliang 2020-02-25 18:53:11 +0800
• d60101b93c 优化单Track情况下等待3秒的情况 xiongziliang 2020-02-25 14:59:40 +0800
• f76109c629 兼容ssrc为0的rtp推流 xiongziliang 2020-02-23 12:16:20 +0800
• 618b028da4 修复拼写错误 xiongziliang 2020-02-21 11:35:53 +0800
• c56a0a0624 更新ZLToolKit xiongziliang 2020-02-18 21:13:30 +0800
• 2ecb9c6887 更新ZLToolKit xiongziliang 2020-02-18 11:25:39 +0800
• a7a376b3f2 流量汇报事件添加id参数 xiongziliang 2020-02-13 12:10:08 +0800
• 7e25537957 流量汇报事件添加客户端ip和端口参数 xiongziliang 2020-02-13 11:33:59 +0800
• ead8b5a89c ios默认只生成c静态库 xiongziliang 2020-02-05 23:34:51 +0800
• 89e191f7fd 添加接口：getMp4RecordFile xiongziliang 2020-02-01 23:26:33 +0800
• 51e0c71007 添加更多录制相关方法 xiongziliang 2020-02-01 22:58:58 +0800
• e8ba94ba09 还原代码 xiongziliang 2020-02-01 22:58:21 +0800
• 6a97fcb3de 媒体注册、重置事件改成同步触发 xiongziliang 2020-02-01 22:57:48 +0800
• 075a615a92 Merge branch 'research' of https://gitee.com/liuziloong/FreeNVR xiongziliang 2020-02-01 21:20:57 +0800
• 92f69c3915 优化纯音频流的延时 xiongziliang 2020-01-24 22:16:28 +0800
• a9539eb626 HLS遇到I帧才切片:#226 xiongziliang 2020-01-24 22:00:55 +0800
• 224a35dbd5 解决单音频无法录制mp4的bug xiongziliang 2020-01-24 21:09:47 +0800
• 90c6dd4bfa 修复关闭hls后无法编译通过的问题 xiongziliang 2020-01-24 20:54:39 +0800
• 4470f2e427 添加addTrackCompleted方法，缩短流注册延时 xiongziliang 2020-01-22 19:09:53 +0800
• ac33592319 修复死锁的问题 xiongziliang 2020-01-21 11:05:51 +0800
• f5187e8b0d 优化GOP相关逻辑 xiongziliang 2020-01-20 16:22:25 +0800
• f453668683 去除侦探gop长度的逻辑 xiongziliang 2020-01-20 15:34:06 +0800
• 795860a019 修复目录级别错误 liuziloong 2020-01-20 15:22:20 +0800
• 2384aa5bbd MP4录像增加一级目录，按照：年月/年月日/*.mp4存储； 增加按月，按天查询mp4录像； 消除一处编译器警告； liuziloong 2020-01-20 15:02:45 +0800
• ee2ca4bda5 Merge branch 'master' into research liuziloong 2020-01-19 15:09:34 +0800
• d2d84680c0 temp liuziloong 2020-01-19 14:54:31 +0800
• cbd6cd4e60 替换不可调试的宏代码 xiongziliang 2020-01-17 11:44:20 +0800
• 81d3e54d45 mark Luke 2020-01-16 11:08:15 +0800
• 22d5ec7796 Merge remote-tracking branch 'origin/master' xiongziliang 2020-01-15 20:00:05 +0800
• 95c8474d48 修复GOP缓存相关小bug xiongziliang 2020-01-15 19:59:47 +0800
• 114d447dac
  Merge pull request #215 from gemfield/master 夏楚 2020-01-15 15:31:14 +0800
• caa870c37e websocket服务器支持根据url选择不同的运行逻辑 xiongziliang 2020-01-15 15:11:42 +0800
• 34e3e9f720 优化及时推拉流秒开成功率 xiongziliang 2020-01-15 11:55:16 +0800
• 2610ba7c8b 修复rtmp注册时还未生成完整config包的bug xiongziliang 2020-01-15 11:46:15 +0800
• 444137e5b7 重写GOP缓存机制 xiongziliang 2020-01-15 11:07:55 +0800
• 0a4b59031f 及时推拉流也能确保第一帧为关键帧 xiongziliang 2020-01-14 19:41:55 +0800
• 5ee913a3bf Split Dockerfile to runtime and devel version, and also reduce the image size for runtime version Gemfield 2020-01-14 19:36:36 +0800
• a573d7302b 提高rtsp客户端兼容性 xiongziliang 2020-01-14 18:11:10 +0800
• dad0175094 Merge branch 'master' into research Luke 2020-01-14 11:39:43 +0800
• 2b511a05cc 修复编译问题 xiongziliang 2020-01-14 11:21:21 +0800
• 2d9537ec84 snap Luke 2020-01-14 10:36:38 +0800
• 491ed6f83d rtsp不允许覆盖时间戳(pts) xiongziliang 2020-01-14 10:34:05 +0800
• 4a7d17334c rtsp不允许覆盖时间戳(pts) xiongziliang 2020-01-14 10:29:27 +0800
• d8dbf43490 优化dts生成性能 xiongziliang 2020-01-14 10:25:14 +0800
• ec67900665 优化不含B帧时的dts生成性能 xiongziliang 2020-01-14 10:06:35 +0800
• 9fa6e9d8d9 添加dts生成算法，兼容含B帧的rtsp推流 xiongziliang 2020-01-14 10:04:24 +0800
• b55db11de3 解决rtmp过早注册的问题 xiongziliang 2020-01-13 15:48:55 +0800
• 66ec67bfb9 1、修复生成的rtmp无法被flash播放的问题 2、修复RTSP有B帧时，相对时间戳计算异常的问题 xiongziliang 2020-01-13 11:51:29 +0800
• db146406c3 修复gcc4.85无法编译的问题 xiongziliang 2020-01-10 15:29:21 +0800
• 8acb6e2093 修正错误注释 xiongziliang 2020-01-09 17:17:48 +0800
• 835d6bd9b5 允许本机和超级用户任意访问http目录 xiongziliang 2020-01-09 17:03:29 +0800
• bad036fdac 添加致谢 xiongziliang 2020-01-09 10:06:30 +0800
• 653132b38c 去除多余日志 xiongziliang 2020-01-08 14:03:56 +0800
• ab32ca39a9 去除多余日志 xiongziliang 2020-01-08 14:00:53 +0800
• 5d2864cff2 优化DevChannel内存拷贝问题 xiongziliang 2020-01-08 12:15:59 +0800
• 57c5d2963a 优化DevChannel内存拷贝问题 xiongziliang 2020-01-08 12:14:27 +0800
• 9cdbe4c4ef 修复协议转换配置开关不生效的bug xiongziliang 2020-01-07 15:38:35 +0800
• 5258169a07 修复协议转换配置开关不生效的bug xiongziliang 2020-01-07 15:37:48 +0800
• 09a2623e1b 还原 xiongziliang 2020-01-07 15:16:01 +0800
• 16751ddf04 windows支持FFmpeg拉流代理 xiongziliang 2020-01-07 15:10:59 +0800
• 77bbc7ae4d Merge remote-tracking branch 'FreeNVR/freenvr' xiongziliang 2020-01-07 15:08:15 +0800
• 9c42c5ed8c windows视频FFmpeg拉流代理 xiongziliang 2020-01-07 14:37:18 +0800
• 5b533354c3 增加todo 刘子龙 2020-01-07 11:17:55 +0800
• 306e202ca1 1.添加windows下ffmpeg拉流分发支持，目前不是很完善，后续再修改 2.server/system下未兼容完成 Luke 2020-01-07 11:09:11 +0800
• 01bae24fdc update zltoolkit xiongziliang 2020-01-07 10:45:55 +0800
• 4591ece566
  Update README.md 夏楚 2020-01-06 14:23:23 +0800
• 3ddb9e4843
  Update README.md 夏楚 2020-01-06 14:19:15 +0800
• 1ce9af35e3 1、复用rtsp url解析代码 2、修复rtsp/rtmp推流异常回调紊乱的问题 xiongziliang 2020-01-04 12:03:53 +0800
• e4f9e377c5 修复FFmpeg日志路径相关的bug xiongziliang 2020-01-03 17:26:36 +0800
• cdba214e79 MP4录制修复兼容性问题 xiongziliang 2020-01-03 14:27:26 +0800
• d482dc1c05 完善http服务器mime类别 xiongziliang 2020-01-02 18:24:11 +0800
• 52d831e990 简化hls cookie相关逻辑 xiongziliang 2020-01-02 17:46:20 +0800