Use %dar in HDV, DV, website and h264 export profiles. Add mp3 sound in HDV as this...

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

diff --git a/export/profiles.xml b/export/profiles.xml
index 257c6aa0e0ca1688ac33ef077886be5cdd8eaf08..46a61323fcda2a69dcb29f102dd00c18d2a3fa20 100644 (file)
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -1,38 +1,38 @@
 <profiles version="0.1">
 <group name="HDV" renderer="avformat" extension="m2t" type="av">
-  <profile name="PAL 1080 50i" standard="PAL" args="f=mpegts vcodec=mpeg2video s=1440x1080 b=19700k ab=384k g=12 ildct=1 ilme=1 profile=hdv_1080_50i" />
-  <profile name="PAL 720 25p" standard="PAL" args="f=mpegts vcodec=mpeg2video s=1280x720 b=19700k ab=384k g=12 profile=hdv_720_25p" />
-  <profile name="NTSC 1080 60i" standard="NTSC" args="f=mpegts vcodec=mpeg2video s=1440x1080 b=19700k ab=384k g=15 ildct=1 ilme=1 profile=hdv_1080_60i" />
-  <profile name="NTSC 720 30p" standard="NTSC" args="f=mpegts vcodec=mpeg2video s=1280x720 b=19700k ab=384k g=15 profile=hdv_720_30p" />
+  <profile name="PAL 1080 50i" standard="PAL" args="f=mpegts acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg2video s=1440x1080 aspect=%dar b=19700k g=12 ildct=1 ilme=1 profile=hdv_1080_50i" />
+  <profile name="PAL 720 25p" standard="PAL" args="f=mpegts acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg2video s=1280x720 aspect=%dar b=19700k g=12 profile=hdv_720_25p" />
+  <profile name="NTSC 1080 60i" standard="NTSC" args="f=mpegts  acodec=libmp3lame ab=384k ar=48000vcodec=mpeg2video s=1440x1080 aspect=%dar b=19700k g=15 ildct=1 ilme=1 profile=hdv_1080_60i" />
+  <profile name="NTSC 720 30p" standard="NTSC" args="f=mpegts  acodec=libmp3lame ab=384k ar=48000 vcodec=mpeg2video s=1280x720 aspect=%dar b=19700k g=15 profile=hdv_720_30p" />
 </group>
 
 <group name="DV" renderer="avformat" type="av">
-  <profile name="PAL Raw" standard="PAL" extension="dv" args="f=dv ildct=1 pix_fmt=yuv420p s=720x576 profile=dv_pal" />
-  <profile name="PAL Raw DV50" standard="PAL" extension="dv" args="f=dv ildct=1 pix_fmt=yuv422p s=720x576 profile=dv_pal" />
-  <profile name="PAL AVI" standard="PAL" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv420p acodec=pcm_s16le s=720x576 profile=dv_pal" />
-  <profile name="PAL AVI DV50" standard="PAL" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv422p s=720x576 profile=dv_pal" />
-
-  <profile name="NTSC Raw" standard="NTSC" extension="dv" args="f=dv ildct=1 pix_fmt=yuv411p s=720x480 profile=dv_ntsc" />
-  <profile name="NTSC Raw DV50" standard="NTSC" extension="dv" args="f=dv ildct=1 pix_fmt=yuv422p s=720x480 profile=dv_ntsc" />
-  <profile name="NTSC AVI" standard="NTSC" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv411p acodec=pcm_s16le s=720x480 profile=dv_ntsc" />
-  <profile name="NTSC AVI DV50" standard="NTSC" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv422p s=720x480 profile=dv_ntsc" />
+  <profile name="PAL Raw" standard="PAL" extension="dv" args="f=dv ildct=1 pix_fmt=yuv420p s=720x576 aspect=%dar profile=dv_pal" />
+  <profile name="PAL Raw DV50" standard="PAL" extension="dv" args="f=dv ildct=1 pix_fmt=yuv422p s=720x576 aspect=%dar profile=dv_pal" />
+  <profile name="PAL AVI" standard="PAL" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv420p acodec=pcm_s16le s=720x576 aspect=%dar profile=dv_pal" />
+  <profile name="PAL AVI DV50" standard="PAL" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv422p s=720x576 aspect=%dar profile=dv_pal" />
+
+  <profile name="NTSC Raw" standard="NTSC" extension="dv" args="f=dv ildct=1 pix_fmt=yuv411p s=720x480 aspect=%dar profile=dv_ntsc" />
+  <profile name="NTSC Raw DV50" standard="NTSC" extension="dv" args="f=dv ildct=1 pix_fmt=yuv422p s=720x480 aspect=%dar profile=dv_ntsc" />
+  <profile name="NTSC AVI" standard="NTSC" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv411p acodec=pcm_s16le s=720x480 aspect=%dar profile=dv_ntsc" />
+  <profile name="NTSC AVI DV50" standard="NTSC" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv422p s=720x480 aspect=%dar profile=dv_ntsc" />
 </group>
 
 <group name="DVD" renderer="avformat" type="av">
   <profile name="PAL 4:3 vob" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 b=5000k maxrate=8000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 s=720x576 g=15 me_range=63 ildct=1 ilme=1 profile=dv_pal" />
-  <profile name="PAL 16:9 vob" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 b=5000k maxrate=8000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=15 me_range=63 ildct=1 ilme=1 profile=dv_pal_wide " />  
+  <profile name="PAL 16:9 vob" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 b=5000k maxrate=8000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=15 me_range=63 ildct=1 ilme=1 profile=dv_pal_wide" />  
     
   <profile name="NTSC 4:3 vob" standard="NTSC" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 s=720x480 b=6000k maxrate=9000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=18 me_range=63 ildct=1 ilme=1 profile=dv_ntsc" />
   <profile name="NTSC 16:9 vob" standard="NTSC" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 s=720x480 b=6000k maxrate=9000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=18 me_range=63 ildct=1 ilme=1 profile=dv_ntsc_wide" />
 </group>
 
 <group name="Web sites" renderer="avformat" type="av">
-  <profile name="Dailymotion 320x240" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=400k s=320x240 trell=1 progressive=1" />
-  <profile name="Dailymotion 512x384" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=700k s=512x384 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="Dailymotion 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=800k s=1280x720 mbd=2 trell=1 mv4=1 progressive=1" />
-   <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 mbd=2 trell=1 mv4=1 progressive=1" />
-  <profile name="Youtube 640x480" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=600k s=640x480 trell=1 progressive=1" />
+  <profile name="Dailymotion 320x240" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=800k s=320x240 aspect=%dar trell=1 progressive=1" />
+  <profile name="Dailymotion 512x384" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=600k s=512x384 aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="Dailymotion 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=1500k s=1280x720 aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+   <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="Youtube 640x480" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=800k s=640x480 aspect=%dar trell=1 progressive=1" />
 </group>
 
 <group name="Mpeg4" renderer="avformat" type="av">
@@ -53,17 +53,17 @@
 </group>
 
 <group name="h264" renderer="avformat" type="av">
-  <profile name="h264 200k" extension="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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="mp4" args="f=mp4 hq=1 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=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=200k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 400k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=400k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 600k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=600k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 800k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=800k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 1000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=1000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 2000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=2000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 4000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=4000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 6000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=6000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 8000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=8000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 10000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=44100 vcodec=libx264 minrate=0 b=10000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
+  <profile name="h264 12000k" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=44100 vcodec=libx264 minrate=0 b=12000k size=%widthx%height aspect=%dar mbd=2 trell=1 mv4=1 progressive=1" />
 </group>
 
 <group name="Flash" renderer="avformat" type="av">