Use FFMpeg instead of Avconv

[meviz.git] / src / main / java / eu / svjatoslav / meviz / grabmemcard / Main.java

diff --git a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
index 44faebc..aa8c42b 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
+++ b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
@@ -1,11 +1,11 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 2019, 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.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
 
 package eu.svjatoslav.meviz.grabmemcard;
 
@@ -17,7 +17,7 @@ import eu.svjatoslav.meviz.encoder.EncodingOptions;
 import eu.svjatoslav.meviz.encoder.EncodingPlan;
 import eu.svjatoslav.meviz.encoder.EncodingTask;
 import eu.svjatoslav.meviz.encoder.converters.AbstractConverter;
-import eu.svjatoslav.meviz.encoder.converters.AvconvVideo;
+import eu.svjatoslav.meviz.encoder.converters.FFMpegVideo;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,7 +31,7 @@ public class Main implements Module {
         return "Convenience helper to retrieve contents of inserted memory card.";
     }
 
-    public File[] getDiskVideos(final File file) {
+    private File[] getDiskVideos(final File file) {
         final String videosPath = file.getAbsolutePath() + "/AVCHD/BDMV/STREAM/";
         final File videosDirectory = new File(videosPath);
 
@@ -41,7 +41,7 @@ public class Main implements Module {
         return videosDirectory.listFiles();
     }
 
-    public String getDoubleDigit(final int value) {
+    private String getDoubleDigit(final int value) {
         String valueString = Integer.toString(value);
         if (valueString.length() == 1)
             valueString = "0" + valueString;
@@ -50,8 +50,8 @@ public class Main implements Module {
 
     private EncodingOptions getEncodingOptions() {
         final EncodingOptions options = new EncodingOptions();
-        options.setVideoBitrate(BitrateParameter.bitrate.COPY);
-        options.setAudioBitrate(BitrateParameter.bitrate.COPY);
+        options.setVideoBitrate(BitrateParameter.Bitrate.COPY);
+        options.setAudioBitrate(BitrateParameter.Bitrate.COPY);
         return options;
     }
 
@@ -61,7 +61,7 @@ public class Main implements Module {
     }
 
     @SuppressWarnings("deprecation")
-    public File getTargetDirectory() {
+    private File getTargetDirectory() {
         final Date now = new Date();
         final GregorianCalendar calendar = new GregorianCalendar();
 
@@ -85,8 +85,7 @@ public class Main implements Module {
         targetFilePath.append("/");
         targetFilePath.append(FilePathParser.getFileNameWithoutExtension(sourceFile));
         targetFilePath.append(".mp4");
-        final File targetFile = new File(targetFilePath.toString());
-        return targetFile;
+        return new File(targetFilePath.toString());
     }
 
     @Override
@@ -95,7 +94,7 @@ public class Main implements Module {
         final File targetDirectory = getTargetDirectory();
         targetDirectory.mkdirs();
 
-        final AbstractConverter converter = new AvconvVideo();
+        final AbstractConverter converter = new FFMpegVideo();
         final EncodingPlan encodingPlan = new EncodingPlan();
 
         final String userName = System.getProperty("user.name");