Changeset 94

Timestamp:

04/14/06 17:59:25 (3 years ago)

Author:

jlee

Message:

Command list clean-up and h264 support

Files:

• trunk/src/Makefile.am (modified) (2 diffs)
• trunk/src/gnu (copied) (copied from trunk/src/gnu)
• trunk/src/gnu/regexp/MessagesBundle_fr.properties (deleted)
• trunk/src/org/thestaticvoid/iriverter/Converter.java (modified) (4 diffs)
• trunk/src/org/thestaticvoid/iriverter/Profile.java (modified) (1 diff)
• trunk/src/profiles/ipod.profile (modified) (1 diff)

trunk/src/Makefile.am

@@ -73 +73 @@
-        org/thestaticvoid/iriverter/icons/singlevideo-16.png
-
+iriverter_resources = \
+        gnu/regexp/MessagesBundle.properties
+
-if !BUILD_GCJ
-iriverter_jardir = $(pkgdatadir)/lib
@@ -91 +94 @@
-
-iriverter.jar: $(iriverter_jar_class_files)
-
+ $(iriverter_resources)
-
-swt.jar: $(SWT_JAR)

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

@@ -175 +175 @@
-        
-        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();
-                
-                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");
+                
-                commandList.add(inputVideo);
+                commandList.add("-o");
+                commandList.add(outputVideo);
-                
-                if (converterOptions.getCurrentProfile().getWrapperFormat().equals("mp4")) {
@@ -208 +188 @@
-                        commandList.add("-lavfopts");
-                        commandList.add("format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames");
+                }
+                
+                commandList.add("-ovc");
+                if (converterOptions.getCurrentProfile().getVideoFormat().equals("h264")) {
+                        commandList.add("x264");
+                        commandList.add("-x264encopts");
+                        commandList.add("bitrate=" + converterOptions.getVideoBitrate() + ":bframes=0:level_idc=13:nocabac");
-                } else {
+                        commandList.add("xvid");
+                        commandList.add("-xvidencopts");
+                        commandList.add("bitrate=" + converterOptions.getVideoBitrate() + ":max_bframes=0:profile=sp0");
-                        commandList.add("-ffourcc");
-
-
-
-
-
-
-
-
-
+
+
+
-                commandList.add("-oac");
-                if (converterOptions.getCurrentProfile().getAudioFormat().equals("aac")) {
-                        commandList.add("faac");
-                        commandList.add("-faacopts");
-
+ + ":object=1"
-                } else {
-                        commandList.add("mp3lame");
@@ -229 +213 @@
-                        commandList.add("mode=2:cbr:br=" + converterOptions.getAudioBitrate());
-                }
+                
+                double ofps = (info.getFrameRate() > converterOptions.getCurrentProfile().getMaxFrameRate() ? converterOptions.getCurrentProfile().getMaxFrameRate() : info.getFrameRate());
-                commandList.add("-vf");
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        commandList.add("-af");
-
+
+
+
+
-                }
-                
@@ -243 +249 @@
-                
-                if (!converterOptions.getAutoSync()) {
-                        commandList.add("-mc");
-                        commandList.add("0");
-                        
-                        int offset = converterOptions.getAudioDelay();
-                        commandList.add("-delay");
-offset
+converterOptions.getAudioDelay()
-                }
-                

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

@@ -95 +95 @@
-        }
-        
+        public String getVideoFormat() {
+                String videoFormat = readOption("videoFormat");
+                if (videoFormat.equals(""))
+                        return "mpeg4";
+                
+                return videoFormat;
+        }
+        
-        public String getAudioFormat() {
-                String audioFormat = readOption("audioFormat");

trunk/src/profiles/ipod.profile

@@ -1 +1 @@
-brand=Apple
-device=iPod 5G
-2500
+768
-maxAudioBitrate=160
-dimensions=320x240
-maxFrameRate=30
-wrapperFormat=mp4
+videoFormat=h264
-audioFormat=aac