[transmageddon] Remove a lot of debug spew, add debug menu item

commit e0f660457389b31c566b388cb337ae29149a6175
Author: Christian Schaller <christian.schaller@xxxxxxxxxxxxxxx>
Date:   Fri Jul 31 17:06:04 2009 +0100

    Remove a lot of debug spew, add debug menu item

 src/codecfinder.py       |    3 +--
 src/discoverer.py        |    2 +-
 src/transcoder_engine.py |   19 +++----------------
 src/transmageddon.glade  |   18 ++++++++++++++++++
 src/transmageddon.py     |    9 ++++++---
 5 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/src/codecfinder.py b/src/codecfinder.py
index 88caf9e..3deb15e 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -146,8 +146,7 @@ def get_audio_encoder_element(audioencodercaps):
                        audiocoderchoice[result] = codec
            else:
                    audiocoderchoice[result] = codec
-   print audiocoderchoice
-   print "audioencodercaps incoming is " + str(audioencodercaps)
+
    if audiocoderchoice.has_key(audioencodercaps):
        elementname = audiocoderchoice[audioencodercaps]
    else:
diff --git a/src/discoverer.py b/src/discoverer.py
index 5e2e08f..ef7a759 100644
--- a/src/discoverer.py
+++ b/src/discoverer.py
@@ -330,7 +330,7 @@ class Discoverer(gst.Pipeline):
                                    if attr not in blacklist:
                                        aresult += 
","+attr+"="+str(caps[0][attr])
                            self.inputaudiocaps = aresult
-                           print "discoverer: self.inputaudiocaps " + 
str(self.inputaudiocaps)
+                           # print "discoverer: self.inputaudiocaps " + 
str(self.inputaudiocaps)
            elif c.startswith("video/"):
               if c.startswith("video/x-raw-yuv") == False or 
c.startswith("video/x-raw-rgb") == False:
                   if caps.is_fixed():
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index 49a5b1e..f7c3a11 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -130,21 +130,14 @@ class Transcoder(gobject.GObject):
                    sourcecaps = x.get_caps()
                    if videointersect == ("EMPTY"): 
                        videointersect = 
sourcecaps.intersect(gst.caps_from_string(self.videocaps))
-                       # print "muxer video intersect is " + 
str(videointersect)
                        if videointersect != ("EMPTY"):
                            # print "pad is X which is " + str(x)
                            self.containermuxervideosinkpad = 
self.containermuxer.get_request_pad(x.name_template)
-                           print "self.containermuxervideosinkpad is " + 
str(self.containermuxervideosinkpad)
                    if audiointersect == ("EMPTY"):
-                       # print "self.audiocaps is " + str(self.audiocaps)
-                       # print "caps converted audio caps is " + 
str(gst.caps_from_string(self.audiocaps))
                        audiointersect = 
sourcecaps.intersect(gst.caps_from_string(self.audiocaps))
-                       print "muxer audio intersect is " + str(audiointersect)
                        if audiointersect != ("EMPTY"):
                            self.containermuxeraudiosinkpad = 
self.containermuxer.get_request_pad(x.name_template)
-                           # print "self.containermuxeraudiosinkpad " + 
str(self.containermuxeraudiosinkpad)
-                       # else:
-                           # print "audiointersect is EMPTY and thus no 
self.containermuxeraudiosinkpad gets created"
+
            self.pipeline.add(self.containermuxer)
 
 
@@ -321,12 +314,11 @@ class Transcoder(gobject.GObject):
    def OnDynamicPad(self, dbin, sink_pad):
        c = sink_pad.get_caps().to_string()
        if c.startswith("audio/"):
-           print "audio pad found"
+           # print "audio pad found"
            if self.audiopasstoggle == False:
                if (self.multipass == False) or (self.passcounter == int(0)):
                    self.audioconverter = 
gst.element_factory_make("audioconvert")
                    self.pipeline.add(self.audioconverter)
-                   print "self.AudioEncoderPlugin is " + 
str(self.AudioEncoderPlugin)
                    self.audioencoder = 
gst.element_factory_make(self.AudioEncoderPlugin)
                    self.pipeline.add(self.audioencoder)
                    if self.preset != "nopreset":
@@ -365,7 +357,7 @@ class Transcoder(gobject.GObject):
                self.audioencoder.set_state(gst.STATE_PAUSED)
                self.gstmultiqueue.set_state(gst.STATE_PAUSED)
                self.multiqueueaudiosrcpad.link(self.containermuxeraudiosinkpad)
-               print "containermuxer audio sinkpad  is " + 
str(self.containermuxeraudiosinkpad)
+
 
            else:
                # TODO: dynamically plug correct parser. Iterate on parsers and 
intersect.
@@ -373,13 +365,11 @@ class Transcoder(gobject.GObject):
                parsedcaps = gst.caps_from_string(self.audiocaps+",parsed=true")
                framedcaps = gst.caps_from_string(self.audiocaps+",framed=true")
                if (sink_pad.get_caps().is_subset(parsedcaps)) or 
(sink_pad.get_caps().is_subset(framedcaps)):
-                   print "is framedcaps subset? Yes"
                    sink_pad.link(self.multiqueueaudiosinkpad)
                    
self.multiqueueaudiosrcpad.link(self.containermuxeraudiosinkpad)
                    self.gstmultiqueue.set_state(gst.STATE_PAUSED)
                else:
                    flist = 
gst.registry_get_default().get_feature_list(gst.ElementFactory)
-                   print "need audio parser"
                    parsers = []
                    for fact in flist:
                        # print "fact is " + str(fact)
@@ -522,12 +512,10 @@ class Transcoder(gobject.GObject):
                vparsedcaps = 
gst.caps_from_string(self.videocaps+",parsed=true")
                vframedcaps = 
gst.caps_from_string(self.videocaps+",framed=true")
                if (sink_pad.get_caps().is_subset(vparsedcaps)) or 
(sink_pad.get_caps().is_subset(vframedcaps)):
-                   print "video is framed, no need for parser"
                    sink_pad.link(self.multiqueuevideosinkpad)
                    
self.multiqueuevideosrcpad.link(self.containermuxervideosinkpad)
                    self.gstmultiqueue.set_state(gst.STATE_PAUSED)
                else:
-                   print "video is NOT framed, need parser"
                    flist = 
gst.registry_get_default().get_feature_list(gst.ElementFactory)
                    parsers = []
                    for fact in flist:
@@ -542,7 +530,6 @@ class Transcoder(gobject.GObject):
                                    if parseintersect == ("EMPTY"):
                                        parseintersect = 
caps.intersect(gst.caps_from_string(self.videocaps))
                                    if parseintersect != ("EMPTY"):
-                                       print "setting parser element" + 
str(parser)
                                        self.vparserelement = parser
                                        self.videoparse = 
gst.element_factory_make(self.vparserelement)
                                        self.pipeline.add(self.videoparse)
diff --git a/src/transmageddon.glade b/src/transmageddon.glade
index b94b776..cffc5f3 100644
--- a/src/transmageddon.glade
+++ b/src/transmageddon.glade
@@ -129,6 +129,24 @@
                   <widget class="GtkMenu" id="menu6">
                     <property name="visible">True</property>
                     <child>
+                      <widget class="GtkImageMenuItem" id="debug">
+                        <property name="label">Debug</property>
+                        <property name="visible">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_debug_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property 
name="xalign">0.40000000596046448</property>
+                            <property 
name="yalign">0.40000000596046448</property>
+                            <property name="xpad">6</property>
+                            <property name="stock">gtk-dialog-info</property>
+                            <property name="icon-size">2</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkImageMenuItem" id="about_dialog">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 91e2cea..89b9d7e 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -52,6 +52,8 @@ if (major == 2) and (minor < 18):
    print "You need version 2.18.0 or higher of pygobject for Transmageddon" 
    sys.exit(1)
 
+os.environ["GST_DEBUG_DUMP_DOT_DIR"] = '/tmp'
+
 supported_containers = [
         "Ogg",
         "Matroska",
@@ -577,7 +579,6 @@ class TransmageddonUI (gtk.glade.XML):
            self.waiting_for_signal="True"
 
    def on_cancelbutton_clicked(self, widget):
-     #  gst.DEBUG_BIN_TO_DOT_FILE (self._transcoder.pipeline, 
gst.DEBUG_GRAPH_SHOW_ALL, 'janishardcore.dot')
        self.FileChooser.set_sensitive(True)
        self.containerchoice.set_sensitive(True)
        self.CodecBox.set_sensitive(True)
@@ -605,7 +606,6 @@ class TransmageddonUI (gtk.glade.XML):
            b.set_sensitive(False)
        for c in codecs:
            self.codec_buttons[c].set_sensitive(True)
-       # print "self.AudioCodec before active button is " + 
str(self.AudioCodec)
        self.codec_buttons[self.AudioCodec].set_active(True)
        self.codec_buttons[self.VideoCodec].set_active(True)
        self.check_for_passthrough(self.container)
@@ -635,7 +635,6 @@ class TransmageddonUI (gtk.glade.XML):
 
    def on_rotationchoice_changed(self, widget):
        self.rotationvalue = self.rotationchoice.get_active()
-       # print "rotationchoice value " + str(self.rotationvalue)
 
    def on_audiobutton_pressed(self, widget, codec):
        self.AudioCodec = codec
@@ -657,6 +656,10 @@ class TransmageddonUI (gtk.glade.XML):
        """
        about.AboutDialog()
 
+   def on_debug_activate(self, widget):
+       gst.DEBUG_BIN_TO_DOT_FILE (self._transcoder.pipeline, 
gst.DEBUG_GRAPH_SHOW_ALL, 'transmageddon-debug-graph')
+       os.system("dot -Tsvg -o /tmp/transmageddon-pipeline.svg 
/tmp/transmageddon-debug-graph.dot")
+       os.system("eog /tmp/transmageddon-pipeline.svg &")
 if __name__ == "__main__":
         hwg = TransmageddonUI()
         gtk.main()
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit 
your options and select the modules ('topics') you want.