Using mp4 as container for quality rendering, as per discussion with Dan.

svn path=/branches/KDE4/; revision=2586

diff --git a/export/profiles.xml b/export/profiles.xml
index 8df8bf9acd4950cd81132db61a0722cad5e6d9e8..6468f61084484fc2c155fe17d301e4b168cecac9 100644 (file)
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -30,18 +30,18 @@
   <profile name="Dailymotion 320x240" extension="avi" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=400k s=320x240 trell=1 progressive=1 g=30" />
   <profile name="Dailymotion 640x480" extension="avi" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=600k s=640x480 trell=1 progressive=1 g=30" />
   <profile name="Dailymotion 1280x720" extension="avi" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=1500k s=1280x720 trell=1 progressive=1 g=30" />
-   <profile name="Vimeo 640x480" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 mbd=2 trell=1 mv4=1 progressive=1 g=30" />
-  <profile name="Vimeo 1280x720" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 mbd=2 trell=1 mv4=1 progressive=1 g=30" />
-  <profile name="Youtube 640x480" extension="avi" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=libxvid minrate=0 b=600k s=640x480 trell=1 progressive=1 g=30" />
+   <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 mbd=2 trell=1 mv4=1 progressive=1 g=30" />
+  <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 mbd=2 trell=1 mv4=1 progressive=1 g=30" />
+  <profile name="Youtube 640x480" extension="avi" args="f=avi hq acodec=libmp3lame ab=128k ar=44100 vcodec=libxvid minrate=0 b=600k s=640x480 trell=1 progressive=1 g=30" />
 </group>
 
 <group name="Mpeg4" renderer="avformat" type="av">
-  <profile name="160x120" extension="mp4" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=600k s=160x120 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="240x180" extension="mp4" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=900k s=240x180 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="320x200" extension="mp4" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=1200k s=320x200 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="640x480" extension="mp4" args="f=avi acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=6000k s=640x480 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="720x576" standard="PAL" extension="mp4" args="f=avi acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg4 s=720x576 minrate=0 b=8000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="720x480" standard="NTSC" extension="mp4" args="f=avi acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg4 s=720x480 minrate=0 b=8000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="160x120" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=600k s=160x120 mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="240x180" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=900k s=240x180 mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="320x200" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=1200k s=320x200 mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="640x480" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=6000k s=640x480 mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="720x576" standard="PAL" extension="mp4" args="f=mp4 acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg4 s=720x576 minrate=0 b=8000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="720x480" standard="NTSC" extension="mp4" args="f=mp4 acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg4 s=720x480 minrate=0 b=8000k mbd=2 trell=1 mv4=1 progressive=1" />
 </group>
 
 <group name="XVid4" renderer="avformat" type="av">
@@ -53,17 +53,17 @@
 </group>
 
 <group name="h264" renderer="avformat" type="av">
-  <profile name="h264 200k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=200k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 400k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=400k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 600k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=600k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 800k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=800k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 1000k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=1000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 2000k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=2000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 4000k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=4000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 6000k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=6000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 8000k" extension="avi" args="f=avi acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=8000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 10000k" extension="avi" args="f=avi acodec=libfaac ab=384k ar=44100 vcodec=libx264 minrate=0 b=10000k mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="h264 12000k" extension="avi" args="f=avi acodec=libfaac ab=384k ar=44100 vcodec=libx264 minrate=0 b=12000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 200k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=200k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 400k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=400k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 600k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=600k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 800k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=800k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 1000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=1000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 2000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=2000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 4000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=4000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 6000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=6000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 8000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=128k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=8000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 10000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=384k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=10000k mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 12000k" extension="mp4" args="f=mp4 hq acodec=libfaac ab=384k ar=44100 async=1 vsync=0 vcodec=libx264 minrate=0 b=12000k mbd=2 trell=1 mv4=1 progressive=1" />
 </group>
 
 <group name="Flash" renderer="avformat" type="av">
@@ -91,7 +91,7 @@
 </group>
 
 <group name="Mpeg" renderer="avformat" type="av">
-  <profile name="160x120" extension="mpeg" args="f=mpeg minrate=0 b=400k ab=128k ar=32000 s=160x120 progressive=1" />
+  <profile name="160x120" extension="mpeg" args="f=mpeg minrate=0 b=400k ab=128k ar=44100 s=160x120 progressive=1" />
   <profile name="240x180" extension="mpeg" args="f=mpeg minrate=0 b=500k ab=128k ar=44100 s=240x180 progressive=1" />
   <profile name="320x200" extension="mpeg" args="f=mpeg minrate=0 b=800k ab=128k ar=44100 s=320x200 progressive=1" />
   <profile name="640x480" extension="mpeg" args="f=mpeg minrate=0 b=6000k ab=128k ar=44100 s=640x480 progressive=1" />