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

• 5007578202 hls/ts 播放器不做content-length严格限制 ziyue 2022-01-21 16:10:27 +0800
• f46d909bba 添加bom头，解决msvc编译问题 xiongziliang 2022-01-20 22:49:47 +0800
• bf191aa902 去除多余头文件 ziyue 2022-01-20 15:39:40 +0800
• 88dc8d0a73 重写http客户端异常处理机制 ziyue 2022-01-20 14:48:45 +0800
• 0f905b7333 优化http-ts播放器日志提示 ziyue 2022-01-19 22:53:21 +0800
• ee6ad66a6d HTTP: 重写http相关超时管理机制 ziyue 2022-01-19 22:50:44 +0800
• 03a8d3a6ac Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-19 17:45:15 +0800
• 81cf93a2bf openRtpServer接口强制关闭reuse_port属性，防止端口冲突 ziyue 2022-01-19 17:44:58 +0800
• 23774cc3b3
  Update README.md 夏楚 2022-01-19 17:17:22 +0800
• bde80d205f
  Update README.md 夏楚 2022-01-19 17:12:03 +0800
• 8937d9ea92 添加递归溢出检测代码: #1363 ziyue 2022-01-17 14:47:55 +0800
• 0c4410c523 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-17 10:36:00 +0800
• 27482a5459 修复编译警告 ziyue 2022-01-17 10:35:29 +0800
• c9d755f4e8 修复编译问题 xiongziliang 2022-01-14 22:04:46 +0800
• e8b0993493
  给openrtpserver接口添加enable_reuse参数 (#1372) wangcker 2022-01-14 21:53:01 +0800
• a3e628449e
  解决rtsp以MULTICAST方式拉流导致的奔溃问题 (#1368) JayChen0519 2022-01-14 13:14:30 +0800
• 30db79f4dd Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-14 13:10:27 +0800
• 556161c20f 更新三方库 ziyue 2022-01-14 13:09:57 +0800
• 75465311d9 修复丢包导致aac确实导致内存越界的bug: #1363 ziyue 2022-01-14 13:09:47 +0800
• d4d7a72dcb
  邮件地址markdown不识别 (#1362) alexliyu7352 2022-01-13 20:11:58 +0800
• 9284dc00be
  Update README.md 夏楚 2022-01-13 18:10:20 +0800
• b7b47db91e 更新文档描述 ziyue 2022-01-13 16:23:15 +0800
• 402214c3d4 添加断连续推功能描述 ziyue 2022-01-13 16:08:23 +0800
• a0dec8cd79 支持多级溯源 ziyue 2022-01-12 20:24:19 +0800
• f0cd54fe83 更新溯源功能相关描述 ziyue 2022-01-12 19:54:22 +0800
• 170f5500cf 新增溯源超时时间配置项 ziyue 2022-01-12 17:58:07 +0800
• 6f4d8c5884 Typo: 修复错误注释 ziyue 2022-01-12 17:51:00 +0800
• 838e4f2788 溯源集群模式支持多个源站 ziyue 2022-01-12 17:43:07 +0800
• be77f84315 支持溯源方式的集群模式 ziyue 2022-01-12 16:45:47 +0800
• d52fc4c31f Refine: 优化rtsp相关代码 ziyue 2022-01-12 15:21:33 +0800
• 5b6ff0af27 完善mingw编译环境的适配 ziyue 2022-01-11 14:09:57 +0800
• fdcc29e0ed 修复http客户端复用header无法更新的bug: #1349 ziyue 2022-01-11 10:44:49 +0800
• 60f11df1ea Revert "修复302跳转时, 如果跨域,header不正确的问题 (#1349)" xiongziliang 2022-01-11 09:18:36 +0800
• 6636482bcf 修复c api日志打印bug ziyue 2022-01-10 19:57:26 +0800
• 09ac333e35 webrtc支持断连续推 ziyue 2022-01-10 17:43:28 +0800
• 412d280cd7 修复断连续推转协议失效的bug ziyue 2022-01-10 17:34:25 +0800
• 1dabc22347 修正错误注释 ziyue 2022-01-10 17:00:25 +0800
• f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 ziyue 2022-01-10 16:37:50 +0800
• 262af8dfeb 修复编译问题 xiongziliang 2022-01-09 15:12:23 +0800
• 7b04385bc8 合并http-ts播放器特性: #1336 xiongziliang 2022-01-09 15:01:23 +0800
• a4c69e61cd Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit xiongziliang 2022-01-09 14:54:21 +0800
• 26d458d067
  增加ffmpeg拉流自动重启时间, 避免长时间拉流导致的声音不同步现象 (#1346) alexliyu7352 2022-01-09 14:51:54 +0800
• 819599ac25
  修复获取帧率逻辑 (#1293) Dw9 2022-01-09 14:50:54 +0800
• 741b197f31
  修复302跳转时, 如果跨域,header不正确的问题 (#1349) alexliyu7352 2022-01-09 14:32:59 +0800
• f4d8eb4515 Rtmp: 获取h264sps/aac config失败时打印rtmp包内容 xiongziliang 2022-01-08 16:21:00 +0800
• 692febcadd Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-01-08 16:07:45 +0800
• 6e445614b4 申请udp端口使用全局互斥锁保护，防止端口重复分配 xiongziliang 2022-01-08 16:07:08 +0800
• c22644af12 更新zlmrtcclient.js 播放客户端，增加状态改变通知 xgj 2022-01-08 15:37:20 +0800
• afc7b019f1 完善日志去重逻辑 ziyue 2022-01-07 11:00:58 +0800
• 1d81a77171 修复windows下编译错误 ziyue 2022-01-06 16:05:17 +0800
• fd6e4b6342 MPEG: 优化http-ts性能: #1342 ziyue 2022-01-06 15:30:09 +0800
• 5a592e6db6 优化循环池性能 ziyue 2022-01-06 14:30:44 +0800
• e2636c5179 更新zltoolkit ziyue 2022-01-06 12:43:58 +0800
• e43c838c2a Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-06 12:35:23 +0800
• 328dc77a78 Merge remote-tracking branch 'origin/master' ziyue 2022-01-06 12:34:32 +0800
• 974626024d 更新并适配zltoolkit, 过滤重复日志 ziyue 2022-01-06 12:34:21 +0800
• 3a0857ea31
  当url并不是m3u8文件时, 避免拉取hls流出错 (#1341) alexliyu7352 2022-01-05 20:01:19 +0800
• 2fbb40135c 修改docker镜像为国内源，加快镜像构建速度 monktan 2022-01-04 21:13:55 +0800
• ed4291bf3d Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-04 16:54:51 +0800
• 3ccd48e7a9 HLS: 返回全部切片数据后，链接断开不报错: #1332 ziyue 2022-01-04 16:52:51 +0800
• 6f9f93cb97
  忘记删除很早很早以前注释掉的代码了 alexliyu7352 2022-01-04 15:46:48 +0800
• 4792f6213b 新增Ts拉流 Alex 2022-01-04 15:32:59 +0800
• a441168004
  修正不使用resetWhenReplay选项时, MediaSource会重复注册的问题 (#1330) alexliyu7352 2022-01-04 14:47:41 +0800
• 80d24d2884 修复Windows下编译问题 ziyue 2021-12-31 14:24:15 +0800
• d9db31055c 更新第三方库，修复http-fmp4直播内存持续增长bug ziyue 2021-12-31 11:30:04 +0800
• 389dd5f54b MPEG: 优化ts/ps muxer内存malloc和拷贝性能 ziyue 2021-12-31 11:01:56 +0800
• 038a604d4f openssl未找到时关闭webrtc编译 ziyue 2021-12-31 10:35:52 +0800
• c0afcc48e5 malloc大内存警告环境变量改名为MEM_WARN_SIZE ziyue 2021-12-31 10:26:36 +0800
• 9cf6fea03e 修复编译问题 xiongziliang 2021-12-30 22:12:36 +0800
• 84f3aa0748 完善内存统计并在malloc大内存时打印backtrace ziyue 2021-12-30 20:34:56 +0800
• 7f6be9e118 Refine: 消除编译警告 ziyue 2021-12-30 15:28:02 +0800
• 940fe333db 尝试解决全局malloc统计相关变量提前销毁的bug ziyue 2021-12-30 12:02:45 +0800
• 1a6a62a304 malloc确保内存对齐 ziyue 2021-12-29 20:57:35 +0800
• 15297a3ca3
  添加内存malloc次数分布统计 (#1322) 夏楚 2021-12-29 20:48:15 +0800
• 098ecf542a 部分代码移至第三方库 ziyue 2021-12-29 14:18:52 +0800
• 5ae5c66256 Typo: 修复拼写错误 ziyue 2021-12-28 21:29:00 +0800
• 89870190e9 MPEG: 整合复用ts/ps生成代码 ziyue 2021-12-28 21:04:53 +0800
• dce6b27f4f Http-FLV: http-flv直播采用绝对时间戳并支持las ziyue 2021-12-28 17:22:16 +0800
• 30b63ad656 Rtmp: rtmp分发改成绝对时间戳 ziyue 2021-12-28 17:12:52 +0800
• b749cfb8a3 TS: hls/http-ts 改为绝对时间戳 ziyue 2021-12-28 17:09:20 +0800
• 878ce87329
  支持线程内存malloc统计 (#1317) 夏楚 2021-12-27 17:40:15 +0800
• 7f649b94e5 Rtmp: 修复openssl未开启导致链接失败的问题: #1301 xiongziliang 2021-12-26 19:58:01 +0800
• 8afafb1ce0 更新第三方库: #1310 xiongziliang 2021-12-26 19:20:21 +0800
• 98d435ef50 Rtmp: 修复openssl未开启导致编译失败的问题: #1301 xiongziliang 2021-12-26 18:34:55 +0800
• 3d44c772ac HLS: hls播放器解析ts失败时，清空数据以便恢复播放 ziyue 2021-12-24 19:58:27 +0800
• b1f68b9563 Splitter公开一些方法 ziyue 2021-12-24 19:57:03 +0800
• 3cba8fca79 分包器缓存太多时主动清空数据 ziyue 2021-12-24 17:47:15 +0800
• 5832de7ed8 HLS: ts分包器主动丢弃非法数据 ziyue 2021-12-24 14:25:01 +0800
• c25ff6400f HLS: hls播放解决播放下一个切片导致数据丢失的bug： #1294 ziyue 2021-12-24 13:29:16 +0800
• 0bf75529a2 HTTP: 确保http请求结束后不再触发超时事件 ziyue 2021-12-24 13:10:52 +0800
• f89abfaf67 HTTP: 优化http客户端代码，并修复重定向时超时的bug: #1306 ziyue 2021-12-24 11:22:17 +0800
• 4e01c29833 Rtmp: 优化复杂握手c0c1生成算法性能 ziyue 2021-12-22 22:20:28 +0800
• ab14585a81 Rtmp: rtmp客户端支持复杂握手，兼容某些rtmp服务器 ziyue 2021-12-22 22:06:19 +0800
• 2e9ff3ed3c HLS: 修复hls直播ts/m3u8文件更新导致mmap失效，触发bus error的bug ziyue 2021-12-22 15:42:03 +0800
• fe575af0d8 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2021-12-22 14:06:46 +0800
• 6a044f0726 HLS: 修复http客户端连接复用导致hls播放异常的bug: #1294 ziyue 2021-12-22 11:33:40 +0800
• 052cca0753
  实现Windows系统下restartServer API接口 (#1292) lawrencehj 2021-12-19 17:39:50 +0800
• ee13ca57c2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2021-12-17 22:40:42 +0800
• 0feac7c924 MP4: mp4开始点播确保MediaSource注册后再返回 xiongziliang 2021-12-17 22:33:08 +0800
• 0d5ef99724
  http客户端支持简单验证协议 (#1289) alexliyu7352 2021-12-17 17:48:05 +0800