[transmageddon] Re-add presets to build, re-enable black border addition in transcoder engine

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

commit 93d98fcfbae493eb09bf9c17c1255fe677cdea96
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Mon Oct 3 09:05:44 2011 +0100

    Re-add presets to build, re-enable black border addition in transcoder engine

 Makefile.am              |    2 +-
 profiles/psp.xml         |    5 +++--
 src/transcoder_engine.py |   34 +++++-----------------------------
 src/transmageddon.py     |    1 -
 4 files changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d4f591e..a0c283e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I common/m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS	= bin src common po profiles
+SUBDIRS	= bin src common po profiles presets
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/profiles/psp.xml b/profiles/psp.xml
index 6bf3053..28ab70d 100644
--- a/profiles/psp.xml
+++ b/profiles/psp.xml
@@ -22,10 +22,11 @@
         </audio>
         <video>
             <name>video/x-h264, profile=main</name>
+            <border>Y</border>
             <passes>0</passes>
             <pixelaspectratio>0/0</pixelaspectratio>
-            <width>320	</width>
-            <height>240</height>
+            <width>320, 320	</width>
+            <height>240, 240</height>
             <framerate>1, 25</framerate>
         </video>
     </profile>
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index 5851055..ff55d64 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -120,11 +120,11 @@ class Transcoder(gobject.GObject):
 
        audiopreset=None
        videopreset=None
-       # if self.preset != "nopreset": 
+       if self.preset != "nopreset": 
            # print "got preset and will use Quality Normal"
            # these values should not be hardcoded, but gotten from profile XML file
-           # audiopreset="Quality Normal"
-           #videopreset="Quality Normal"
+           audiopreset="Quality Normal"
+           videopreset="Quality Normal"
 
        if self.container==False:
            if self.audiocaps.intersect(gst.Caps("audio/mpeg, mpegversion=4")):
@@ -261,32 +261,8 @@ class Transcoder(gobject.GObject):
 
        # Add any required padding
        if self.blackborderflag == True:
-           if width < wmin and height < hmin:
-               wpx = (wmin - width) / 2
-               hpx = (hmin - height) / 2
-               self.vbox['left'] = -wpx
-               self.vbox['right'] = -wpx
-               self.vbox['top'] = -hpx
-               self.vbox['bottom'] = -hpx
-           elif width < wmin:
-               # print "adding width borders"
-               px = (wmin - width) / 2
-               self.vbox['left'] = -px
-               self.vbox['right'] = -px
-               self.vbox['top'] = -0
-               self.vbox['bottom'] = -0
-           elif height < hmin:
-               # print " adding height borders"
-               px = (hmin - height) / 2
-               self.vbox['top'] = -px
-               self.vbox['bottom'] = -px
-               self.vbox['left'] = -int(0)
-               self.vbox['right'] = -int(0)
-           else:
-               self.vbox['top'] = -int(0)
-               self.vbox['bottom'] = -int(0)
-               self.vbox['left'] = -int(0)
-               self.vbox['right'] = -int(0)
+           width=wmax
+           height=hmax
 
        # Setup video framerate and add to caps - 
        # FIXME: Is minimum framerate really worthwhile checking for?
diff --git a/src/transmageddon.py b/src/transmageddon.py
index cb8c714..dd49d1c 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -476,7 +476,6 @@ class TransmageddonUI:
                self.ProgressBar.set_fraction(0.0)
                return False
        else:
-           print "complete progress measuering failure"
            return False
 
    # Call gobject.timeout_add with a value of 500millisecond to regularly poll