From bc4340e9f1ca17ad2970f58ab19603c5d90b52ef Mon Sep 17 00:00:00 2001 From: yukihane Date: Thu, 15 Sep 2011 20:18:19 +0900 Subject: [PATCH] =?utf8?q?=E6=96=B0=E3=81=97=E3=81=84=E3=83=90=E3=83=BC?= =?utf8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AEffmpeg=E5=87=A6=E7=90=86?= =?utf8?q?=E6=99=82=E9=96=93=E5=87=BA=E5=8A=9B=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- frontend/src/saccubus/worker/impl/convert/Convert.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/src/saccubus/worker/impl/convert/Convert.java b/frontend/src/saccubus/worker/impl/convert/Convert.java index 5299af3..0fa9916 100644 --- a/frontend/src/saccubus/worker/impl/convert/Convert.java +++ b/frontend/src/saccubus/worker/impl/convert/Convert.java @@ -202,7 +202,7 @@ public class Convert extends Worker { logger.info("arg: {}", cmdList); return cmdList; } - private static final Pattern PATTERN_TIME = Pattern.compile("time=(\\d+)"); + private static final Pattern PATTERN_TIME = Pattern.compile("time=(\\d+):(\\d+):(\\d+)"); private int executeFfmpeg(final List cmdList, int duration) throws InterruptedException, IOException { Process process = null; @@ -217,10 +217,14 @@ public class Convert extends Worker { final Matcher m = PATTERN_TIME.matcher(msg); double per = -1.0; if (m.find()) { - final String strTime = m.group(1); - final double time = Double.parseDouble(strTime); + final double hour = Integer.parseInt(m.group(1)); + final double min = Integer.parseInt(m.group(2)); + final double sec = Integer.parseInt(m.group(3)); + final double time = ((hour * 60) + min) * 60 + sec; per = 100.0 * time / duration; - logger.trace("time:{}, duration:{}", time, duration); + if (logger.isTraceEnabled()) { + logger.trace("time:{}, duration:{}", time, duration); + } } publish(new ConvertProgress(PROCESS, per, msg)); } else if (!msg.endsWith("No accelerated colorspace conversion found")) { -- 2.11.0