X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FCommandlineHandler.java;h=e83b4b87775a4d0382bd901b4dee287896462ec2;hb=3e5c4ae5e9e2a67702e37124ed38cacdbd4fcdf1;hp=d6282c20aeee6131a80b38594da8032d22823f59;hpb=ba52d2d46b4c8fc8ea74a98afa9f606e1f139672;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index d6282c2..e83b4b8 100755
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
@@ -11,6 +11,7 @@ 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;
 
@@ -18,40 +19,33 @@ public class CommandlineHandler {
 
 	Parser parser = new Parser();
 
-	StringParameters outputFormatParameter = parser
-			.add(new StringParameters("Encoding output format."))
+	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");
+	IntegerParameter targetFramerate = parser
+			.add(new IntegerParameter("Target framerate.").addAliases("-f", "--target-framerate"));
 
-	NullParameter testParameter = parser.add(
-			new NullParameter("Simulate file encoding.")).addAliases("-t",
-			"--test");
+	NullParameter deinterlaceParameter = parser.add(new NullParameter("Deinterlace video.")).addAliases("-d",
+			"--deinterlace");
 
-	NullParameter recursiveParameter = parser.add(
-			new NullParameter("Enable recursive mode.")).addAliases("-r",
+	NullParameter testParameter = parser.add(new NullParameter("Simulate file encoding.")).addAliases("-t", "--test");
+
+	NullParameter recursiveParameter = parser.add(new NullParameter("Enable recursive mode.")).addAliases("-r",
 			"--recursive");
 
-	NullParameter forPortableParameter = parser.add(
-			new NullParameter("Encode for portable player.")).addAliases("-p",
+	NullParameter forPortableParameter = parser.add(new NullParameter("Encode for portable player.")).addAliases("-p",
 			"--portable");
 
-	StringParameters inputPatternParameter = parser
-			.add(new StringParameters("File input pattern."))
+	StringParameters inputPatternParameter = parser.add(new StringParameters("File input pattern."))
 			.addAliases("-i", "--input-pattern").setMandatory();
 
-	DirectoryParameter workingDirectoryParameter = parser
-			.add(new DirectoryParameter("Working directory."))
+	DirectoryParameter workingDirectoryParameter = parser.add(new DirectoryParameter("Working directory."))
 			.addAliases("-w", "--working-directory").mustExist();
 
-	BitrateParameter videoBitrateParameter = parser.add(
-			new BitrateParameter("Video bitrate")).addAliases("-v",
+	BitrateParameter videoBitrateParameter = parser.add(new BitrateParameter("Video bitrate")).addAliases("-v",
 			"--video-bitrate");
 
-	BitrateParameter audioBitrateParameter = parser.add(
-			new BitrateParameter("Audio bitrate")).addAliases("-a",
+	BitrateParameter audioBitrateParameter = parser.add(new BitrateParameter("Audio bitrate")).addAliases("-a",
 			"--audio-bitrate");
 
 	/**
@@ -74,6 +68,9 @@ public class CommandlineHandler {
 		if (outputFormatParameter.isParameterSpecified())
 			options.getOutputFormats().addAll(outputFormatParameter.getValue());
 
+		if (targetFramerate.isParameterSpecified())
+			options.setTargetFps(targetFramerate.getValue());
+
 		if (workingDirectoryParameter.isParameterSpecified())
 			options.setWorkingDirectory(workingDirectoryParameter.getValue());