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

• 6d697daeb0 去除FrameMerger逻辑 xiongziliang 2019-12-13 15:49:57 +0800
• 14ba899c61 选择是否导出调试文件 xiongziliang 2019-12-13 15:43:24 +0800
• 6e59000265 修复过滤多余帧类型导致的bug xiongziliang 2019-12-13 15:42:58 +0800
• bd8a9a78e8 rtp代理防止时间戳回环 xiongziliang 2019-12-13 15:42:12 +0800
• fbf0f63503 1、getMediaList接入添加tracks、readerCount字段 2、添加getMediaInfo接口 xiongziliang 2019-12-13 13:35:27 +0800
• 89b8d461db
  Merge pull request #167 from gemfield/master 夏楚 2019-12-12 23:02:59 +0800
• d9a5de5a63 修复持续集成编译失败问题 xiongziliang 2019-12-12 23:02:11 +0800
• 5fe5dd9de6 hls保存ts文件时根据日期、时间保存 xiongziliang 2019-12-12 22:58:31 +0800
• ee66d945e8 更新media-server库 xiongziliang 2019-12-12 22:25:55 +0800
• 0adfb3ec83 Fix Docker timezone issue, and also expose RTP port Gemfield 2019-12-12 20:07:21 +0800
• 2a518493d7 完善rtp测试工具 xiongziliang 2019-12-11 20:01:51 +0800
• 99c1dd339f 修复adts头相关bug xiongziliang 2019-12-11 09:29:10 +0800
• df73eb2c10 getSsrcInfo接口ssrc使用16进制字符串 xiongziliang 2019-12-09 18:15:02 +0800
• fa4fac1e0d rtp推流由配置文件决定是否默认录制 xiongziliang 2019-12-09 17:49:00 +0800
• 655a30081b 修复rtp(tcp)获取ssrc失败的bug xiongziliang 2019-12-06 20:18:08 +0800
• adf0e09262 mp4点播支持pts xiongziliang 2019-12-06 17:23:49 +0800
• 030d8f6d53 完成windows下编译 xiongziliang 2019-12-06 13:53:28 +0800
• 1300e11507 完善cmakelist xiongziliang 2019-12-06 13:39:55 +0800
• 0d9bdec182 支持rtp代理服务器 xiongziliang 2019-12-06 11:54:10 +0800
• 55814070f8 Update CMakeFiles for RTP Proxy Gemfield 2019-12-05 19:53:55 +0800
• 55d258fafc Add rtp server Gemfield 2019-12-05 19:20:12 +0800
• 10dc254510 完善stopRecord接口 xiongziliang 2019-12-05 14:31:44 +0800
• 055c312579 修复getRecordStatus接口 xiongziliang 2019-12-05 14:12:22 +0800
• 8502ed27c4 修复录制http ap接口 xiongziliang 2019-12-05 12:55:43 +0800
• 69c0c3e237 添加录制相关http api xiongziliang 2019-12-05 12:04:08 +0800
• f581f0f2a7 优化精简录制相关代码 xiongziliang 2019-12-05 10:47:23 +0800
• 6eb4d5916d 修复bug xiongziliang 2019-12-04 19:19:03 +0800
• 33047ddc94 程序退出前停止一切录制 xiongziliang 2019-12-04 19:15:48 +0800
• 728fd55e0c 修复无法延后录制的bug xiongziliang 2019-12-04 18:58:19 +0800
• ae230bc1aa 优化代码 xiongziliang 2019-12-04 18:53:12 +0800
• 57043138d8 优化代码 xiongziliang 2019-12-04 18:49:22 +0800
• e69cbc1486 优化代码 xiongziliang 2019-12-04 18:46:31 +0800
• 996ff47d26 Merge remote-tracking branch 'origin/master' xiongziliang 2019-12-04 18:36:57 +0800
• b3fcb4c038 重写mp4录制驱动机制 xiongziliang 2019-12-04 18:36:30 +0800
• a79bee1d88
  Update README_CN.md 夏楚 2019-12-04 12:11:36 +0800
• d5a81d7105 规范命名 xiongziliang 2019-12-04 10:59:13 +0800
• de77460621 修复编译失败问题 xiongziliang 2019-12-04 10:52:26 +0800
• de33d6a847 整理文件录制 xiongziliang 2019-12-04 10:45:38 +0800
• 2c2e7262d6 修复bug xiongziliang 2019-12-03 16:14:52 +0800
• 5249c24430 整理MediaSource代码 xiongziliang 2019-12-03 16:10:02 +0800
• 68718953d4 优化代码 xiongziliang 2019-12-03 13:05:23 +0800
• b50a34bf1f 优化代码 xiongziliang 2019-12-03 12:43:48 +0800
• c55f26fba7 整理MediaSink xiongziliang 2019-12-03 12:32:57 +0800
• c1ab73f758 修复类型转换失败的bug xiongziliang 2019-11-30 22:14:22 +0800
• cadff93d4d 1、hls cookie改成60秒有效期并且访问时刷新cookie 2、去除keep-alive下最大请求次数限制 xiongziliang 2019-11-30 14:29:44 +0800
• d46b67a5cf 精简代码 xiongziliang 2019-11-30 11:56:40 +0800
• 12346f77a4 修复编译问题 xiongziliang 2019-11-30 11:44:05 +0800
• a44ab25d46 整理http文件服务器相关代码 xiongziliang 2019-11-30 11:38:00 +0800
• ee528b2bfb Merge remote-tracking branch 'origin/master' xiongziliang 2019-11-29 11:59:55 +0800
• 9b6ee8131b hls用作点播时，那么m3u8文件实时记录为点播 xiongziliang 2019-11-29 11:59:39 +0800
• 64a1255b76
  Update README_CN.md 夏楚 2019-11-29 11:36:26 +0800
• 0c79af024c 切换submodule至gitee xiongziliang 2019-11-29 11:32:17 +0800
• 5e9291e035 添加启动失败处理逻辑 xiongziliang 2019-11-29 11:27:54 +0800
• 22c01d0a03 完善范例配置文件 xiongziliang 2019-11-29 10:14:08 +0800
• d587ddf7ef 添加服务器启动报告 xiongziliang 2019-11-29 10:12:20 +0800
• 544135b2d7 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit xiongziliang 2019-11-29 09:57:11 +0800
• c42ee1dc5d 优化时间戳覆盖逻辑:#148 xiongziliang 2019-11-29 09:54:48 +0800
• e84af6a9e2
  Update ccpp.yml 夏楚 2019-11-26 09:52:20 +0800
• bf70a01f6a 提升rtsp的兼容性 xiongziliang 2019-11-25 17:59:04 +0800
• 21cf3bcee0 播放器track未初始化成功时间改成最大为5秒 xiongziliang 2019-11-21 18:07:40 +0800
• ab97486200 完善判断逻辑 xiongziliang 2019-11-21 16:34:18 +0800
• 54f2c0b53c 兼容一些奇怪sdp的rtsp url xiongziliang 2019-11-21 16:31:50 +0800
• e7bd5a4174 兼容一些奇怪的sdp xiongziliang 2019-11-21 15:11:43 +0800
• 083933cbad 修复访问野指针的问题：#146 xiongziliang 2019-11-21 13:46:42 +0800
• e6d511cc9e 解决播放成功与中途断开事件触发紊乱的问题:#143 xiongziliang 2019-11-19 15:52:02 +0800
• 85cd4a7d02 修复遍历删除可能崩溃的bug xiongziliang 2019-11-19 10:55:44 +0800
• 2eb64d2c39 确保rtp端口为偶数，rtcp端口为奇数 xiongziliang 2019-11-19 10:20:57 +0800
• 517f3c229c 添加kick_sessions接口 xiongziliang 2019-11-18 16:34:39 +0800
• bcc5c839a5 close_stream接口结果返回字段改成result xiongziliang 2019-11-18 16:28:56 +0800
• f628985037 优化代码 xiongziliang 2019-11-18 16:16:56 +0800
• 0d42aab9e7 修复FFmpeg拉流代理无法通过close_stream接口关闭的bug xiongziliang 2019-11-18 12:07:11 +0800
• ddf351d350 添加close_streams接口 xiongziliang 2019-11-18 10:46:59 +0800
• a993132a59 修复FFmpeg拉流代理卡顿的问题 xiongziliang 2019-11-15 13:50:42 +0800
• 08ad39d005
  Update ccpp.yml 夏楚 2019-11-14 15:26:35 +0800
• 2543ee01dc
  Update ccpp.yml 夏楚 2019-11-14 15:22:15 +0800
• a3e67a1306 完成workflows测试 xiongziliang 2019-11-14 15:14:25 +0800
• c8ba6fd73f 更新ZLToolKit xiongziliang 2019-11-14 14:48:27 +0800
• c1f3b8ffbc
  Create ccpp.yml 夏楚 2019-11-14 14:45:12 +0800
• d440c424c4 获取线程负载接口返回code字段 简化代码 xiongziliang 2019-11-13 14:33:19 +0800
• aef8fb8849 添加isMediaOnline接口判断是否媒体在线 xiongziliang 2019-11-13 14:26:12 +0800
• 9665d557ae 兼容拼写错误 xiongziliang 2019-11-13 14:11:49 +0800
• 0522ad2677 Merge remote-tracking branch 'origin/master' xiongziliang 2019-11-13 14:05:33 +0800
• 88a5de00b2 修正拼写错误 xiongziliang 2019-11-13 14:05:15 +0800
• 94eebdadf1
  Update README_CN.md 夏楚 2019-11-13 10:45:52 +0800
• d1fd674c36
  Update README.md 夏楚 2019-11-13 10:43:46 +0800
• 3554fe920f 更新ZLToolKit xiongziliang 2019-11-12 10:00:55 +0800
• 8c0596bfb2 更新ZLToolKit(修复发送缓存覆盖导致ssl错误的bug) xiongziliang 2019-11-12 09:52:34 +0800
• 1b6e61c413 1、修复#125 2、修复非法rtsp url导致异常的问题 xiongziliang 2019-11-11 19:03:03 +0800
• 36a3f4225c Merge remote-tracking branch 'origin/master' xiongziliang 2019-11-11 16:22:31 +0800
• d6b319b993 尝试修复 #125 xiongziliang 2019-11-11 16:22:12 +0800
• c2e3dfbbe9
  Merge pull request #124 from gemfield/master 夏楚 2019-11-08 16:54:23 +0800
• 814e94b6b0 Add Docker support Gemfield 2019-11-08 16:50:23 +0800
• 5a1503008f 完善注释 xiongziliang 2019-11-08 15:55:26 +0800
• a8a4f267f7 添加配置项，控制在关闭hook时，推流是否转协议或录制 xiongziliang 2019-11-08 15:54:13 +0800
• 9b7d62347e 完善 xiongziliang 2019-11-08 15:26:46 +0800
• 9d7b2821b7 初步支持ssl多证书 xiongziliang 2019-11-08 15:20:54 +0800
• ccbd1d4a83 添加hls.segRetain配置项，修复hls切片等于segNum+1的问题 xiongziliang 2019-11-05 10:27:28 +0800
• 35c4c05e7b 修复setServerConfig接口保存配置文件相关bug xiongziliang 2019-11-04 09:21:11 +0800
• a30a83d665 添加H265相关接口 xiongziliang 2019-11-01 15:40:21 +0800
• 5d1df021fe
  Merge pull request #9 from xiongziliang/master baiyfcu 2019-10-30 13:20:09 +0800