X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fgrabmemcard%2FMain.java;h=e5383387992606d77c22862a074a8c9b94cb0b38;hb=34e6964d7b230e1943b14a7107fc73861ab65220;hp=d6d194c593b22d9b9fdb52a7acf355c8e8207852;hpb=7398fdf5927b4aa2314f5d21040205ae016086ab;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
index d6d194c..e538338 100755
--- a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
+++ b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
@@ -32,8 +32,7 @@ public class Main implements Module {
 	}
 
 	public File[] getDiskVideos(final File file) {
-		final String videosPath = file.getAbsolutePath()
-				+ "/AVCHD/BDMV/STREAM/";
+		final String videosPath = file.getAbsolutePath() + "/AVCHD/BDMV/STREAM/";
 		final File videosDirectory = new File(videosPath);
 
 		if (!videosDirectory.exists())
@@ -49,6 +48,13 @@ public class Main implements Module {
 		return valueString;
 	};
 
+	private EncodingOptions getEncodingOptions() {
+		final EncodingOptions options = new EncodingOptions();
+		options.setVideoBitrate(BitrateParameter.bitrate.COPY);
+		options.setAudioBitrate(BitrateParameter.bitrate.COPY);
+		return options;
+	}
+
 	@Override
 	public String getModuleCommand() {
 		return "grabmemcard";
@@ -60,19 +66,14 @@ public class Main implements Module {
 		final GregorianCalendar calendar = new GregorianCalendar();
 
 		final StringBuffer directoryName = new StringBuffer();
-		directoryName.append(calendar.get(GregorianCalendar.YEAR) + "."
-				+ getDoubleDigit(calendar.get(GregorianCalendar.MONTH) + 1)
-				+ "."
-				+ getDoubleDigit(calendar.get(GregorianCalendar.DAY_OF_MONTH))
-				+ " ");
-
-		directoryName.append(getDoubleDigit(now.getHours()) + ":"
-				+ getDoubleDigit(now.getMinutes()) + ":"
+		directoryName.append(
+				calendar.get(GregorianCalendar.YEAR) + "." + getDoubleDigit(calendar.get(GregorianCalendar.MONTH) + 1)
+						+ "." + getDoubleDigit(calendar.get(GregorianCalendar.DAY_OF_MONTH)) + " ");
+
+		directoryName.append(getDoubleDigit(now.getHours()) + ":" + getDoubleDigit(now.getMinutes()) + ":"
 				+ getDoubleDigit(now.getSeconds()));
 
-		final String targetDirectoryPath = CommonPathResolver
-				.getDesktopDirectory().getAbsolutePath()
-				+ "/"
+		final String targetDirectoryPath = CommonPathResolver.getDesktopDirectory().getAbsolutePath() + "/"
 				+ directoryName.toString() + "/";
 
 		System.out.println("Target directory path: " + targetDirectoryPath);
@@ -80,6 +81,17 @@ public class Main implements Module {
 		return new File(targetDirectoryPath);
 	}
 
+	private File getTargetFile(final File targetDirectory, final File sourceFile) {
+		// compute target file path
+		final StringBuffer targetFilePath = new StringBuffer();
+		targetFilePath.append(targetDirectory.getAbsolutePath());
+		targetFilePath.append("/");
+		targetFilePath.append(FilePathParser.getFileNameWithoutExtension(sourceFile));
+		targetFilePath.append(".mp4");
+		final File targetFile = new File(targetFilePath.toString());
+		return targetFile;
+	}
+
 	@Override
 	public void run(final String[] args) throws IOException {
 
@@ -98,25 +110,15 @@ public class Main implements Module {
 
 			for (final File sourceFile : diskVideos) {
 
-				// compute target file path
-				final StringBuffer targetFilePath = new StringBuffer();
-				targetFilePath.append(targetDirectory.getAbsolutePath());
-				targetFilePath.append("/");
-				targetFilePath.append(FilePathParser
-						.getFileNameWithoutExtension(sourceFile));
-				targetFilePath.append(".mp4");
-				final File targetFile = new File(targetFilePath.toString());
-
-				final EncodingTask encodingTask = new EncodingTask(sourceFile,
-						targetFile, converter);
+				final File targetFile = getTargetFile(targetDirectory, sourceFile);
+
+				final EncodingTask encodingTask = new EncodingTask(sourceFile, targetFile, converter, "mp4");
+				encodingTask.setUseTerminal(true);
 				encodingPlan.scheduleTask(encodingTask);
 			}
 		}
 
-		final EncodingOptions options = new EncodingOptions();
-		options.setVideoBitrate(BitrateParameter.bitrate.COPY);
-
-		encodingPlan.execute(options);
+		encodingPlan.execute(getEncodingOptions());
 	}
 
 	@Override