From 8b97c030d34f839ad2e9d6f3d4ace922eb7e9fb4 Mon Sep 17 00:00:00 2001 From: yukihane Date: Thu, 4 Aug 2011 01:16:17 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= =?utf8?q?=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- frontend/src/saccubus/converter/FfmpegCommand.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java index 64b2eb4..da8641a 100644 --- a/frontend/src/saccubus/converter/FfmpegCommand.java +++ b/frontend/src/saccubus/converter/FfmpegCommand.java @@ -145,7 +145,13 @@ public class FfmpegCommand extends AbstractCommand { cmdList.add(scaled.getWidth() + "x" + scaled.getHeight()); } - List avfilterArgs = getAvfilterOptions(ov, addComment, commPath, addTcomment, tcommPath, isHD); + List avfilterArgs = getAvfilterOptions(ov.getAvfilterOption()); + if (!getFfmpeg().isVhookDisabled()) { + String vhookArg = getVhookArg(addComment, commPath, addTcomment, tcommPath, isHD); + if(StringUtils.isNotBlank(vhookArg)){ + avfilterArgs.add(vhookArg); + } + } if (!avfilterArgs.isEmpty()) { cmdList.add("-vfilters"); @@ -192,18 +198,11 @@ public class FfmpegCommand extends AbstractCommand { } } - private List getAvfilterOptions(FfmpegOption ov, boolean addComment, String commPath, boolean addTcomment, - String tcommPath, boolean isHD) throws UnsupportedEncodingException { + private List getAvfilterOptions(String avfilterOption) { final List avfilterArgs = new ArrayList(); - final String avfilterOption = ov.getAvfilterOption(); if (StringUtils.isNotBlank(avfilterOption)) { avfilterArgs.add(avfilterOption); } - final String vhookArg = (getFfmpeg().isVhookDisabled()) - ? null : getVhookArg(addComment, commPath, addTcomment, tcommPath, isHD); - if (vhookArg != null) { - avfilterArgs.add(vhookArg); - } return avfilterArgs; } -- 2.11.0