[mistelix] DVD video conversion fixes. 1) Switches from MP3 to MP2 encoding for audio (MP3 is really not part o

[Jordi Mas <jmas src gnome org>]

commit 60a536697d838957e931f2ccd613f2a8e372486c
Author: Jordi Mas <jmas softcatala org>
Date:   Wed Jul 15 14:28:21 2009 +0200

    DVD video conversion fixes. 1) Switches from MP3 to MP2 encoding for audio (MP3 is really not part of the standard 2) Resamples the audio to 48K to make it DVD compatible 3) Fixes OGG conversion

 libmistelix/video.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/libmistelix/video.c b/libmistelix/video.c
index d9efb38..3ad3421 100644
--- a/libmistelix/video.c
+++ b/libmistelix/video.c
@@ -33,29 +33,33 @@ typedef struct
 
 supported_media supported_medias[] = 
 {
+	//
+	// AC3 (ffenc_ac3) is the most common audio encoding for DVD. We may want to consider to switch 
+	// to AC3 when the dvd_mux supports for it becomes widely available. See http://bugzilla.gnome.org/show_bug.cgi?id=588546
+	//
 	{"video/mpeg", "ffenc_mpeg2video", 
 		"filesrc location=\"%s\" ! mpegdemux name=demux \\ "
 		"{ffmux_dvd preload=500000 maxdelay=699999 name=mux ! filesink location=\"%s\" } \\ "
-		"{demux.audio_00 ! queue ! flump3dec ! queue ! lame ! mux. } \\ "
+		"{demux.audio_00 ! queue ! flump3dec ! queue ! audioresample ! audio/x-raw-int, rate=48000 ! ffenc_mp2 ! mux. } \\ "
 		"{demux.video_00 ! queue ! mpeg2dec ! ffmpegcolorspace ! videorate ! video/x-raw-yuv,format=(fourcc)I420,framerate=%u/1 ! queue ! ffenc_mpeg2video ! mux. }"},
 
 	{"video/x-msvideo", "avidemux", 
 		"filesrc location=\"%s\" ! decodebin name=demux \\ "
 		"{ffmux_dvd  preload=500000 maxdelay=699999 name=mux ! filesink location=\"%s\" } \\ "
-		"{demux. ! queue ! lame ! mux. } \\ "
+		"{demux. ! queue ! audioresample ! audio/x-raw-int, rate=48000 ! ffenc_mp2 ! mux. } \\ "
 		"{demux. ! queue ! ffmpegcolorspace ! videorate ! video/x-raw-yuv,format=(fourcc)I420,framerate=%u/1 ! queue ! ffenc_mpeg2video ! mux. }"},
 
 	{"video/x-ms-asf", "asfdemux", 
 		"filesrc location=\"%s\" ! decodebin name=demux \\ "
 		"{ffmux_dvd  preload=500000 maxdelay=699999 name=mux ! filesink location=\"%s\" } \\ "
-		"{demux. ! queue ! lame ! mux. } \\ "
+		"{demux. ! queue ! audioresample ! audio/x-raw-int, rate=48000 ! ffenc_mp2 ! mux. } \\ "
 		"{demux. ! queue ! ffmpegcolorspace ! videorate ! video/x-raw-yuv,format=(fourcc)I420,framerate=%u/1 ! queue ! ffenc_mpeg2video ! mux. }"},
 
 	{"application/ogg", "oggdemux", 
-		"filesrc location=\"%s\" ! decodebin name=demux \\ "
+		"filesrc location=\"%s\" ! oggdemux name=demux \\ "
 		"{ffmux_dvd  preload=500000 maxdelay=699999 name=mux ! filesink location=\"%s\" } \\ "
-		"{demux. !queue ! vorbisdec ! queue ! audioconvert ! lame ! mux. } \\ "
-		"{demux. ! queue ! ffmpegcolorspace ! videorate ! video/x-raw-yuv,format=(fourcc)I420,framerate=%u/1 ! queue ! ffenc_mpeg2video ! mux. }"},
+		"{demux. !queue ! vorbisdec ! queue ! audioconvert ! audioresample ! audio/x-raw-int, rate=48000 ! ffenc_mp2 ! mux. } \\ "
+		"{demux. ! queue ! theoradec ! ffmpegcolorspace ! videorate ! video/x-raw-yuv,format=(fourcc)I420,framerate=%u/1 ! queue ! ffenc_mpeg2video ! mux. }"},
 
 };