Changeset 82

Timestamp:

04/06/06 22:42:39 (6 years ago)

Author:

jlee

Message:

Removed duplication of conversion code

File:

• trunk/src/org/thestaticvoid/iriverter/Converter.java (modified) (6 diffs)

trunk/src/org/thestaticvoid/iriverter/Converter.java

@@ -170 +170 @@
         }
         
-        public void convertSingleVideo(SingleVideoInfo singleVideoInfo) {
-                progressDialogInfo.setInputVideo(new File(singleVideoInfo.getInputVideo()).getName());
-                progressDialogInfo.setOutputVideo(new File(singleVideoInfo.getOutputVideo()).getName());
-                progressDialogInfo.setStatus("Gathering information about the input video...");
-                
-                MPlayerInfo info = new MPlayerInfo(singleVideoInfo.getInputVideo());
-                
+        private List prepareBaseCommandList(String inputVideo, String outputVideo, MPlayerInfo info) {          
                 int scaledWidth = converterOptions.getDimensions().getWidth();
                 int scaledHeight = (info.getDimensions().getHeight() * converterOptions.getDimensions().getWidth()) / info.getDimensions().getWidth();
@@ -203 +197 @@
                 
                 commandList.add(MPlayerInfo.getMPlayerPath() + "mencoder");
-                commandList.add(singleVideoInfo.getInputVideo());
+                commandList.add(inputVideo);
                 
                 if (converterOptions.getCurrentProfile().getWrapperFormat().equals("mp4")) {
@@ -213 +207 @@
                 
                 commandList.add("-o");
-                commandList.add(singleVideoInfo.getOutputVideo());
+                commandList.add(outputVideo);
                 commandList.add("-ovc");
                 commandList.add("xvid");
@@ -250 +244 @@
                 }
                 
+                return commandList;
+        }
+        
+        public void convertSingleVideo(SingleVideoInfo singleVideoInfo) {
+                progressDialogInfo.setInputVideo(new File(singleVideoInfo.getInputVideo()).getName());
+                progressDialogInfo.setOutputVideo(new File(singleVideoInfo.getInputVideo()).getName());
+                progressDialogInfo.setStatus("Gathering information about the input video...");
+                
+                MPlayerInfo info = new MPlayerInfo(singleVideoInfo.getInputVideo());
+                
+                List commandList = prepareBaseCommandList(singleVideoInfo.getInputVideo(), singleVideoInfo.getOutputVideo(), info);
+                
                 String[] command = new String[commandList.size()];
                 for (int i = 0; i < command.length; i++)
@@ -278 +284 @@
                 MPlayerInfo info = new MPlayerInfo("dvd://" + dvdInfo.getTitle(), dvdInfo.getDrive());
                 
-                int scaledWidth = converterOptions.getDimensions().getWidth();
-                int scaledHeight = (info.getDimensions().getHeight() * converterOptions.getDimensions().getWidth()) / info.getDimensions().getWidth();
-                
-                if (scaledHeight > converterOptions.getDimensions().getHeight()) {
-                        scaledWidth = (scaledWidth * converterOptions.getDimensions().getHeight()) / scaledHeight;
-                        scaledHeight = converterOptions.getDimensions().getHeight();
-                }
-                
-                double ofps = (info.getFrameRate() > converterOptions.getCurrentProfile().getMaxFrameRate() ? converterOptions.getCurrentProfile().getMaxFrameRate() : info.getFrameRate());
-                
-                String vf = "filmdint=io=" + ((int) Math.round(info.getFrameRate() * 1000)) + ":" + ((int) Math.round(ofps * 1000));
-                if (converterOptions.getPanAndScan())
-                        vf += ",scale=" + ((int) ((info.getDimensions().getWidth()) * (((double) converterOptions.getDimensions().getHeight()) / (double) info.getDimensions().getHeight()))) + ":" + converterOptions.getDimensions().getHeight() + ",crop=" + converterOptions.getDimensions().getWidth() + ":" + converterOptions.getDimensions().getHeight();
-                else
-                        vf += ",scale=" + scaledWidth + ":" + scaledHeight + ",expand=" + converterOptions.getDimensions().getWidth() + ":" + converterOptions.getDimensions().getHeight();
-                vf += ",harddup";
-                
-                String af = "";
-                if (converterOptions.getVolumeFilter() == VolumeFilter.VOLNORM)
-                        af = "volnorm," + af;
-                if (converterOptions.getVolumeFilter() == VolumeFilter.VOLUME)
-                        af = "volume=" + converterOptions.getGain() + "," + af;
-                
-                List commandList = new ArrayList();
-                
-                commandList.add(MPlayerInfo.getMPlayerPath() + "mencoder");
+                List commandList = prepareBaseCommandList("dvd://" + dvdInfo.getTitle(), dvdInfo.getOutputVideo(), info);
+                
                 commandList.add("-dvd-device");
                 commandList.add(dvdInfo.getDrive());
-                commandList.add("dvd://" + dvdInfo.getTitle());
-                
-                if (converterOptions.getCurrentProfile().getWrapperFormat().equals("mp4")) {
-                        commandList.add("-of");
-                        commandList.add("lavf");
-                        commandList.add("-lavfopts");
-                        commandList.add("format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames");
-                }
-                
-                commandList.add("-o");
-                commandList.add(dvdInfo.getOutputVideo());
-                commandList.add("-ovc");
-                commandList.add("xvid");
-                commandList.add("-xvidencopts");
-                commandList.add("bitrate=" + converterOptions.getVideoBitrate() + ":max_bframes=0");
-                commandList.add("-oac");
-                if (converterOptions.getCurrentProfile().getAudioFormat().equals("aac")) {
-                        commandList.add("faac");
-                        commandList.add("-faacopts");
-                        commandList.add("br=" + converterOptions.getAudioBitrate());
-                } else {
-                        commandList.add("mp3lame");
-                        commandList.add("-lameopts");
-                        commandList.add("mode=2:cbr:br=" + converterOptions.getAudioBitrate());
-                }
-                commandList.add("-vf");
-                commandList.add(vf);
-                
-                if (!af.equals("")) {
-                        commandList.add("-af");
-                        commandList.add(af);
-                }
-                
-                commandList.add("-ofps");
-                commandList.add("" + ofps);
-                commandList.add("-srate");
-                commandList.add("44100");
-                
+        
                 if (dvdInfo.getAudioStream() > -1) {
                         commandList.add("-aid");
@@ -357 +302 @@
                         commandList.add("-chapter");
                         commandList.add(dvdInfo.getChapters()[0].getFirstChapter() + "-" + dvdInfo.getChapters()[0].getLastChapter());
-                }
-                
-                if (!converterOptions.getAutoSync()) {
-                        commandList.add("-mc");
-                        commandList.add("0");
-                        
-                        int offset = converterOptions.getAudioDelay();
-                        commandList.add("-delay");
-                        commandList.add("" + (offset / 1000.0));
                 }