From 336ce9f0f524008ef3cfe0832d5aef14808573d3 Mon Sep 17 00:00:00 2001
From: rarzel <rarzel.heinrich@gmail.com>
Date: Tue, 23 Jul 2024 07:04:52 +0900
Subject: [PATCH] =?UTF-8?q?FFmpeg=207.0=E3=81=A7=E3=82=A8=E3=83=B3?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E9=80=B2=E6=8D=97=E7=8A=B6?=
 =?UTF-8?q?=E6=B3=81=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/enc-enhance.js.template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/enc-enhance.js.template b/config/enc-enhance.js.template
index 8e1f4671..9e7310c6 100644
--- a/config/enc-enhance.js.template
+++ b/config/enc-enhance.js.template
@@ -77,10 +77,10 @@ Array.prototype.push.apply(args, [output]);
         for (let i = 0; i < strbyline.length; i++) {
             let str = strbyline[i];
             if (str.startsWith('frame')) {
-                // 想定log
-                // frame= 5159 fps= 11 q=29.0 size=  122624kB time=00:02:51.84 bitrate=5845.8kbits/s dup=19 drop=0 speed=0.372x
+                // 想定log ※ kBはffmpeg 7.0未満での表記
+                // frame= 5159 fps= 11 q=29.0 size=  122624(k|Ki)B time=00:02:51.84 bitrate=5845.8kbits/s dup=19 drop=0 speed=0.372x
                 const progress = {};
-                const ffmpeg_reg = /frame=\s*(?<frame>\d+)\sfps=\s*(?<fps>\d+(?:\.\d+)?)\sq=\s*(?<q>[+-]?\d+(?:\.\d+)?)\sL?size=\s*(?<size>\d+(?:\.\d+)?)kB\stime=\s*(?<time>\d+[:\.\d+]*)\sbitrate=\s*(?<bitrate>\d+(?:\.\d+)?)kbits\/s(?:\sdup=\s*(?<dup>\d+))?(?:\sdrop=\s*(?<drop>\d+))?\sspeed=\s*(?<speed>\d+(?:\.\d+)?)x/;
+                const ffmpeg_reg = /frame=\s*(?<frame>\d+)\sfps=\s*(?<fps>\d+(?:\.\d+)?)\sq=\s*(?<q>[+-]?\d+(?:\.\d+)?)\sL?size=\s*(?<size>\d+(?:\.\d+)?)(kB|KiB)\stime=\s*(?<time>\d+[:\.\d+]*)\sbitrate=\s*(?<bitrate>\d+(?:\.\d+)?)kbits\/s(?:\sdup=\s*(?<dup>\d+))?(?:\sdrop=\s*(?<drop>\d+))?\sspeed=\s*(?<speed>\d+(?:\.\d+)?)x/;
                 let ffmatch =str.match(ffmpeg_reg);
                 /**
                  * match結果