X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2Fconverters%2FAvconvVideo.java;h=6a43d2621d0ccddd4bd22bcbefc87072fa1571aa;hb=937fb9256703fa11e1e65f08c9721d2a0431242d;hp=c63837ad50f1d733a53232d4e74413db218c7b97;hpb=565d9c726de9b50709027f9455d39499a17f4b25;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
index c63837a..6a43d26 100644
--- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.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.
@@ -30,8 +30,8 @@ public class AvconvVideo extends AbstractConverter {
 			break;
 
 		case MEDIUM:
-			videoBitrate = 3500;
-			audioBitrate = 128;
+			videoBitrate = 4000;
+			audioBitrate = 192;
 			break;
 
 		case HIGH:
@@ -47,27 +47,36 @@ public class AvconvVideo extends AbstractConverter {
 		// convert
 		final StringBuffer codecParams = new StringBuffer();
 
-		codecParams.append("-acodec libmp3lame -vcodec libx264");
+		String videoCodec = "libx264 ";
+
+		if (options.forPortablePlayer) {
+			videoBitrate = 1000;
+			audioBitrate = 128;
+			videoCodec = "libxvid ";
+			codecParams.append("-s 640x480 ");
+		}
+
+		codecParams.append("-acodec libmp3lame -vcodec " + videoCodec);
 
-		codecParams.append(" -b " + videoBitrate + "k");
-		codecParams.append(" -b:a " + audioBitrate + "k");
+		codecParams.append("-b " + videoBitrate + "k ");
+		codecParams.append("-b:a " + audioBitrate + "k ");
 
 		if (options.deinterlace)
-			codecParams.append(" -filter:v yadif");
+			codecParams.append("-filter:v yadif ");
 
 		return "avconv -i \"" + inputFile.getAbsolutePath() + "\" "
-				+ codecParams.toString() + " \"" + targetFile.getAbsolutePath()
+				+ codecParams.toString() + "\"" + targetFile.getAbsolutePath()
 				+ "\"";
 	}
 
 	@Override
 	public List<String> getSourceFileExtensions() {
-		return toList("mkv", "mts");
+		return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob");
 	}
 
 	@Override
 	public List<String> getTargetFileExtensions() {
-		return toList("mp4");
+		return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob");
 	}
 
 	@Override