zaheer - in flumotion/trunk: . flumotion/component/encoders/theora

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Mon Feb 19 19:01:19 2007
New Revision: 4496

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/encoders/theora/theora.py
Log:
2007-02-19  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

        * flumotion/component/encoders/theora/theora.py:
        Repeat after me, do not modify the config dict!
        Fixes #571



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Feb 19 19:01:19 2007
@@ -1,3 +1,9 @@
+2007-02-19  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* flumotion/component/encoders/theora/theora.py:
+	Repeat after me, do not modify the config dict!
+	Fixes #571
+
 2007-02-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/launch/main.py:

Modified: flumotion/trunk/flumotion/component/encoders/theora/theora.py
==============================================================================
--- flumotion/trunk/flumotion/component/encoders/theora/theora.py	(original)
+++ flumotion/trunk/flumotion/component/encoders/theora/theora.py	Mon Feb 19 19:01:19 2007
@@ -68,11 +68,6 @@
                         "multiplying the value by 1000.")), id='bitrate'))
                 properties['bitrate'] *= 1000
 
-        # FIXME: GStreamer 0.10 has bitrate in kbps, inconsistent
-        # with all other elements, so fix it up
-        if 'bitrate' in properties:
-            properties['bitrate'] = int(properties['bitrate'] / 1000)
-
         for p in props:
             pproperty = isinstance(p, tuple) and p[0] or p
             eproperty = isinstance(p, tuple) and p[1] or p
@@ -80,5 +75,11 @@
             if pproperty in properties:
                 self.debug('Setting GStreamer property %s to %r' % (
                     eproperty, properties[pproperty]))
-                element.set_property(eproperty, properties[pproperty])
+                # FIXME: GStreamer 0.10 has bitrate in kbps, inconsistent
+                # with all other elements, so fix it up
+                if pproperty == 'bitrate':
+                    element.set_property(eproperty, 
+                        int(properties[pproperty]/1000))
+                else:
+                    element.set_property(eproperty, properties[pproperty])