[transmageddon] Commit all current changes

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit d1d735786031b5c6a62808a52489f4d7a1678d08
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Mon Feb 7 13:21:06 2011 +0000

    Commit all current changes

 src/Makefile.am                    |    2 +-
 src/codecfinder.py                 |    8 ++++++--
 src/transcoder_engine.py           |    5 +----
 src/transcoder_engine_encodebin.py |   14 +++-----------
 4 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index b59eec9..bd1802f 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,9 @@ transmageddondir = $(datadir)/transmageddon
 transmageddon_PYTHON = \
 	transmageddon.py \
 	transcoder_engine.py \
+        transcoder_engine_preset.py \
 	transmageddon.ui \
 	codecfinder.py \
-        discoverer.py \
 	presets.py \
 	utils.py \
 	about.py \
diff --git a/src/codecfinder.py b/src/codecfinder.py
index e582ef4..d46a2eb 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -37,11 +37,15 @@ containermap = { 'Ogg' : "application/ogg",'Matroska' : "video/x-matroska", 'MXF
                         'Quicktime' : "video/quicktime,variant=apple", 'MPEG4' : "video/quicktime,variant=iso", 
                         'MPEG PS' : "video/mpeg,mpegversion=2,systemstream=true", 
                         'MPEG TS' : "video/mpegts", 'FLV' : "video/x-flv", '3GPP' : "video/quicktime,variant=3gpp",
-                        'ASF' : "video/x-ms-asf", 'WebM' : "video/webm" }
+                        'ASF' : "video/x-ms-asf", 'WebM' : "video/webm", 'No container' : False }
 
 csuffixmap =   { 'Ogg' : ".ogg", 'Matroska' : ".mkv", 'MXF' : ".mxf", 'AVI' : ".avi", 'Quicktime' : ".mov",
                         'MPEG4' : ".mp4", 'MPEG PS' : ".mpg", 'MPEG TS' : ".ts", 'FLV' : ".flv", '3GPP' : ".3gp",
-                 'ASF' : ".asf", 'WebM' : ".webm" }
+                 'ASF' : ".asf", 'WebM' : ".webm", 'No container' : ".mp3" }
+
+audiosuffixmap =   { 'Ogg' : ".ogg", 'Matroska' : ".mkv", 'MXF' : ".mxf", 'AVI' : ".avi", 'Quicktime' : ".m4a",
+                        'MPEG4' : ".mp4", 'MPEG PS' : ".mpg", 'MPEG TS' : ".ts", 'FLV' : ".flv", '3GPP' : ".3gp",
+                      'ASF' : ".wma", 'WebM' : ".webm", 'No container' : ".mp3" }
 
 codecmap = {     'Vorbis' : "audio/x-vorbis", 'FLAC' : "audio/x-flac", 'mp3' : "audio/mpeg, mpegversion=(int)1, layer=(int)3", 
                         'AAC' : "audio/mpeg,mpegversion=4", 'AC3' : "audio/x-ac3", 'Speex' : "audio/x-speex", 
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index 9762e87..7757f84 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -96,13 +96,10 @@ class Transcoder(gobject.GObject):
 
        self.gstmultiqueue = gst.element_factory_make("multiqueue")
        self.multiqueueaudiosinkpad = self.gstmultiqueue.get_request_pad("sink0")
-       # print "self.multiqueueaudiosinkpad " + str(self.multiqueueaudiosinkpad)
        self.multiqueuevideosinkpad = self.gstmultiqueue.get_request_pad("sink1")
-       # print "self.multiqueuevideosinkpad " + str(self.multiqueuevideosinkpad)
        self.multiqueueaudiosrcpad = self.gstmultiqueue.get_pad("src0")
-       # print "self.multiqueueaudiosrcpad " + str(self.multiqueueaudiosrcpad)
        self.multiqueuevideosrcpad = self.gstmultiqueue.get_pad("src1")
-       # print "self.multiqueuevideosrcpad " + str(self.multiqueuevideosrcpad)
+
        self.pipeline.add(self.gstmultiqueue) 
 
        # print "audiopass toggle is " + str(self.audiopasstoggle)
diff --git a/src/transcoder_engine_encodebin.py b/src/transcoder_engine_encodebin.py
index 7c94783..42acb86 100644
--- a/src/transcoder_engine_encodebin.py
+++ b/src/transcoder_engine_encodebin.py
@@ -96,9 +96,9 @@ class Transcoder(gobject.GObject):
 
        # self.pipeline.add(self.gstmultiqueue) 
 
-       self.encodebinprofile = gst.pbutils.EncodingContainerProfile ("ogg", None , gst.Caps("application/ogg"), None)
-       self.videoprofile = gst.pbutils.EncodingVideoProfile (gst.Caps("video/x-theora"), None, gst.caps_new_any(), 0)
-       self.audioprofile = gst.pbutils.EncodingAudioProfile (gst.Caps("audio/x-vorbis"), None, gst.caps_new_any(), 0)
+       self.encodebinprofile = gst.pbutils.EncodingContainerProfile ("ogg", None , gst.Caps(self.containercaps), None)
+       self.videoprofile = gst.pbutils.EncodingVideoProfile (gst.Caps(self.videocaps), None, gst.caps_new_any(), 0)
+       self.audioprofile = gst.pbutils.EncodingAudioProfile (gst.Caps(self.audiocaps), None, gst.caps_new_any(), 0)
        self.encodebinprofile.add_profile(self.videoprofile)
        self.encodebinprofile.add_profile(self.audioprofile)
 
@@ -194,17 +194,9 @@ class Transcoder(gobject.GObject):
            self.pipeline.remove(self.uridecoder)
        return True
 
-   def list_compat(self, a1, b1):
-       for x1 in a1:
-           if not x1 in b1:
-               return False
-       return True
-
    def OnDynamicPad(self, uridecodebin, src_pad):
        c = src_pad.get_caps().to_string()
-       print "c is " + str(c)
        sinkpad = self.encodebin.emit("request-pad", src_pad.get_caps())
-       print "action signal returned", sinkpad
        src_pad.link(sinkpad)
 
    def Pipeline (self, state):