X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=meviz.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FCommandlineHandler.java;h=1c65a33cc56f105dbcb25da3d263f413d6255557;hp=ec7d9cd7932ba98e80aad995dc66c1c7e8b563d8;hb=cf6e4ace4972f24f40f88ea12fcf99c763e4e40a;hpb=bafe09c26e6ebb5fadf408ecd46bea79cd79e8f1

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index ec7d9cd..1c65a33 100755
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
@@ -1,6 +1,6 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 2018, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
@@ -11,86 +11,80 @@ package eu.svjatoslav.meviz.encoder;
 
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.IntegerParameter;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters;
 
-public class CommandlineHandler {
+class CommandlineHandler {
 
-	Parser parser = new Parser();
+    final Parser parser = new Parser();
 
-	StringParameters outputFormatParameter = parser
-			.add(new StringParameters("Encoding output format."))
-			.addAliases("-o", "--output-format").setMandatory();
+    private final StringParameters outputFormatParameter = parser.add(new StringParameters("Encoding output format."))
+            .addAliases("-o", "--output-format").setMandatory();
 
-	NullParameter deinterlaceParameter = parser.add(
-			new NullParameter("Deinterlace video.")).addAliases(
-			"--deinterlace", "-d");
+    private final IntegerParameter targetFramerate = parser
+            .add(new IntegerParameter("Target framerate.").addAliases("-f", "--target-framerate"));
 
-	NullParameter testParameter = parser.add(
-			new NullParameter("Simulate file encoding.")).addAliases("-t",
-					"--test");
+    private final NullParameter deinterlaceParameter = parser.add(new NullParameter("Deinterlace video.")).addAliases("-d",
+            "--deinterlace");
 
-	NullParameter recursiveParameter = parser.add(
-			new NullParameter("Enable recursive mode.")).addAliases("-r",
-			"--recursive");
+    private final NullParameter testParameter = parser.add(new NullParameter("Simulate file encoding.")).addAliases("-t", "--test");
 
-	NullParameter forPortableParameter = parser.add(
-			new NullParameter("Encode for portable player.")).addAliases("-p",
-					"--portable");
+    private final NullParameter recursiveParameter = parser.add(new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
 
-	StringParameters inputPatternParameter = parser
-			.add(new StringParameters("File input pattern."))
-			.addAliases("-i", "--input-pattern").setMandatory();
+    private final NullParameter forPortableParameter = parser.add(new NullParameter("Encode for portable player.")).addAliases("-p",
+            "--portable");
 
-	DirectoryParameter workingDirectoryParameter = parser
-			.add(new DirectoryParameter("Working directory."))
-			.addAliases("-w", "--working-directory").mustExist();
+    private final StringParameters inputPatternParameter = parser.add(new StringParameters("File input pattern."))
+            .addAliases("-i", "--input-pattern").setMandatory();
 
-	BitrateParameter videoBitrateParameter = parser.add(
-			new BitrateParameter("Video bitrate")).addAliases("-v",
-			"--video-bitrate");
+    private final DirectoryParameter workingDirectoryParameter = parser.add(new DirectoryParameter("Working directory."))
+            .addAliases("-w", "--working-directory").mustExist();
 
-	BitrateParameter audioBitrateParameter = parser.add(
-			new BitrateParameter("Audio bitrate")).addAliases("-a",
-					"--audio-bitrate");
+    private final BitrateParameter videoBitrateParameter = parser.add(new BitrateParameter("Video bitrate")).addAliases("-v",
+            "--video-bitrate");
 
-	/**
-	 * @return {@link EncodingOptions} if commandline arguments were
-	 *         successfully parsed, or <code>null</code> if parsing error
-	 *         occurred.
-	 */
-	public EncodingOptions parseCommandlineArguments(final String[] args) {
+    private final BitrateParameter audioBitrateParameter = parser.add(new BitrateParameter("Audio bitrate")).addAliases("-a",
+            "--audio-bitrate");
 
-		final EncodingOptions options = new EncodingOptions();
+    /**
+     * @return {@link EncodingOptions} if commandline arguments were
+     * successfully parsed, or <code>null</code> if parsing error
+     * occurred.
+     */
+    public EncodingOptions parseCommandlineArguments(final String[] args) {
 
-		parser.parse(args);
+        final EncodingOptions options = new EncodingOptions();
 
-		options.recursive = recursiveParameter.isParameterSpecified();
+        parser.parse(args);
 
-		options.deinterlace = deinterlaceParameter.isParameterSpecified();
+        options.setRecursive(recursiveParameter.isSpecified());
 
-		options.testOnly = testParameter.isParameterSpecified();
+        options.setDeinterlace(deinterlaceParameter.isSpecified());
 
-		if (outputFormatParameter.isParameterSpecified())
-			options.outputFormats.addAll(outputFormatParameter.getValue());
+        options.setTestOnly(testParameter.isSpecified());
 
-		if (workingDirectoryParameter.isParameterSpecified())
-			options.workingDirectory = workingDirectoryParameter.getValue();
+        if (outputFormatParameter.isSpecified())
+            options.getOutputFormats().addAll(outputFormatParameter.getValue());
 
-		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter.getValue());
+        if (targetFramerate.isSpecified())
+            options.setTargetFps(targetFramerate.getValue());
 
-		options.forPortablePlayer = forPortableParameter.isParameterSpecified();
+        if (workingDirectoryParameter.isSpecified())
+            options.setWorkingDirectory(workingDirectoryParameter.getValue());
 
-		if (videoBitrateParameter.isParameterSpecified())
-			try {
-				options.setVideoBitrate(videoBitrateParameter.getValue());
-			} catch (final Exception e) {
-				System.out
-						.println("Invalid video bitrate. Valid values are: LOW, MEDIUM, HIGH.");
-				return null;
-			}
+        if (inputPatternParameter.isSpecified())
+            options.getInputPatterns().addAll(inputPatternParameter.getValue());
 
-		return options;
-	}
+        options.setForPortablePlayer(forPortableParameter.isSpecified());
+
+        if (videoBitrateParameter.isSpecified())
+            options.setVideoBitrate(videoBitrateParameter.getValue());
+
+        if (audioBitrateParameter.isSpecified())
+            options.setAudioBitrate(audioBitrateParameter.getValue());
+
+        return options;
+    }
 }