Changeset 81

Timestamp:

04/06/06 22:27:03 (6 years ago)

Author:

jlee

Message:

Use input's frame rate if possible, otherwise use device's max frame rate

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• org/thestaticvoid/iriverter/Converter.java (modified) (4 diffs)
• org/thestaticvoid/iriverter/ConverterOptions.java (modified) (1 diff)
• org/thestaticvoid/iriverter/ConverterUI.java (modified) (3 diffs)
• org/thestaticvoid/iriverter/FrameRateDialog.java (deleted)

trunk/src/Makefile.am

@@ -14 +14 @@
 
 iriverter_source_files = \
-        org/thestaticvoid/iriverter/FrameRateDialog.java \
         org/thestaticvoid/iriverter/DVD.java \
         org/thestaticvoid/iriverter/SingleVideoAdapter.java \

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

@@ -185 +185 @@
                 }
                 
-                String vf = "filmdint=io=" + ((int) Math.round(info.getFrameRate() * 1000)) + ":" + ((int) Math.round(converterOptions.getFrameRate() * 1000));
+                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();
@@ -228 +230 @@
                 commandList.add("-vf");
                 commandList.add(vf);
-                commandList.add("-af");
-                commandList.add(af);
+                
+                if (!af.equals("")) {
+                        commandList.add("-af");
+                        commandList.add(af);
+                }
+                
                 commandList.add("-ofps");
-                commandList.add("" + converterOptions.getFrameRate());
+                commandList.add("" + ofps);
                 commandList.add("-srate");
                 commandList.add("44100");
@@ -280 +286 @@
                 }
                 
-                String vf = "filmdint=io=" + ((int) Math.round(info.getFrameRate() * 1000)) + ":" + ((int) Math.round(converterOptions.getFrameRate() * 1000));
+                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();
@@ -325 +333 @@
                 commandList.add("-vf");
                 commandList.add(vf);
-                commandList.add("-af");
-                commandList.add(af);
+                
+                if (!af.equals("")) {
+                        commandList.add("-af");
+                        commandList.add(af);
+                }
+                
                 commandList.add("-ofps");
-                commandList.add("" + converterOptions.getFrameRate());
+                commandList.add("" + ofps);
                 commandList.add("-srate");
                 commandList.add("44100");

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

@@ -102 +102 @@
                 return Integer.parseInt(audioBitrate);
         }
-        
-        public double getFrameRate() {
-                String frameRate = readOption("frameRate");
-                if (frameRate.equals(""))
-                        return getCurrentProfile().getMaxFrameRate();
-                
-                return Double.parseDouble(frameRate);
-        }
 
         public Dimensions getDimensions() {

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

@@ -19 +19 @@
         private CTabFolder tabFolder;
         private Map profileMenuItems, dimensionsMenuItems;
-        private MenuItem convert, playFile, newSingleVideo, newDirectory, newDVD, advancedJobs, manualSplit, joinVideos, moveUp, moveDown, closeJob, closeAllJobs, quit, bitrate, videoSize, frameRate, panAndScan, advancedOptions, audioSync, automaticallySplit, volume, contents, about;
+        private MenuItem convert, playFile, newSingleVideo, newDirectory, newDVD, advancedJobs, manualSplit, joinVideos, moveUp, moveDown, closeJob, closeAllJobs, quit, bitrate, videoSize, panAndScan, advancedOptions, audioSync, automaticallySplit, volume, contents, about;
         private Menu videoSizeMenu;
         private DropTarget target;
@@ -197 +197 @@
                 videoSizeMenu = new Menu(shell, SWT.DROP_DOWN);
                 videoSize.setMenu(videoSizeMenu);
-                
-                frameRate = new MenuItem(optionsMenu, SWT.PUSH);
-                frameRate.setText("&Frame Rate...");
-                frameRate.addSelectionListener(this);
 
                 new MenuItem(optionsMenu, SWT.SEPARATOR);
@@ -405 +401 @@
                 if (dimensionsMenuItems.containsKey(e.getSource())) {
 
-                }
-                
-                if (e.getSource() == frameRate) {
-                        FrameRateDialog frameRateDialog = new FrameRateDialog(shell, SWT.NONE, converterOptions.getCurrentProfile().getMaxFrameRate(), converterOptions.getFrameRate());
-                        converterOptions.writeOption("frameRate", "" + frameRateDialog.open());
                 }