X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fgrabmemcard%2FMain.java;h=920a95ca45bf449ae65aaeb9d6de3a92bb364c57;hb=3e5c4ae5e9e2a67702e37124ed38cacdbd4fcdf1;hp=cb3406a4c285ef8adef81b6182dae5e61361596b;hpb=512eb322715ca1c626517b0124926729310e7b2e;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 cb3406a..920a95c 100755
--- a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
+++ b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, 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
  * as published by the Free Software Foundation.
@@ -17,11 +17,12 @@ import java.util.GregorianCalendar;
 import eu.svjatoslav.commons.file.CommonPathResolver;
 import eu.svjatoslav.commons.file.FilePathParser;
 import eu.svjatoslav.meviz.Module;
+import eu.svjatoslav.meviz.encoder.BitrateParameter;
 import eu.svjatoslav.meviz.encoder.EncodingOptions;
 import eu.svjatoslav.meviz.encoder.EncodingPlan;
 import eu.svjatoslav.meviz.encoder.EncodingTask;
-import eu.svjatoslav.meviz.encoder.converters.Converter;
-import eu.svjatoslav.meviz.encoder.converters.Mts2Mp4;
+import eu.svjatoslav.meviz.encoder.converters.AbstractConverter;
+import eu.svjatoslav.meviz.encoder.converters.AvconvVideo;
 
 public class Main implements Module {
 
@@ -85,7 +86,7 @@ public class Main implements Module {
 		final File targetDirectory = getTargetDirectory();
 		targetDirectory.mkdirs();
 
-		final Converter converter = new Mts2Mp4();
+		final AbstractConverter converter = new AvconvVideo();
 		final EncodingPlan encodingPlan = new EncodingPlan();
 
 		final String userName = System.getProperty("user.name");
@@ -97,24 +98,34 @@ 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 File targetFile = getTargetFile(targetDirectory, sourceFile);
 
 				final EncodingTask encodingTask = new EncodingTask(sourceFile,
-						targetFile, converter);
+						targetFile, converter, "mp4");
 				encodingPlan.scheduleTask(encodingTask);
 			}
 		}
 
+		encodingPlan.execute(getEncodingOptions());
+	}
+
+	private EncodingOptions getEncodingOptions() {
 		final EncodingOptions options = new EncodingOptions();
+		options.setVideoBitrate(BitrateParameter.bitrate.COPY);
+		options.setAudioBitrate(BitrateParameter.bitrate.COPY);
+		return options;
+	}
 
-		encodingPlan.execute(options);
+	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