changeset 98b1e19ae4a3 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=98b1e19ae4a3 description: Backed out changeset 1e414d1b429c

diffstat:

src/common/jingle_rtp.py | 11 +++-------- src/common/multimedia_helpers.py | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r 1e414d1b429c -r 98b1e19ae4a3 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Apr 20 16:15:25 2012 +0200 +++ b/src/common/jingle_rtp.py Fri Apr 20 16:27:30 2012 +0200 @@ -364,13 +364,9 @@ JingleRTPContent.setup_stream(self, self._on_src_pad_added)

# the local parts - if gajim.config.get('video_input_device').startswith('ximagesrc'): - colorspace = 'rgb' - else: - colorspace = 'yuv' if gajim.config.get('video_framerate'): - framerate = 'videorate ! video/x-raw-%s,framerate=%s ! ' % \ - (colorspace, gajim.config.get('video_framerate')) + framerate = 'videorate ! video/x-raw-yuv,framerate=%s ! ' % \ + gajim.config.get('video_framerate') else: framerate = '' try: @@ -378,8 +374,7 @@ except: w = h = None if w and h: - video_size = 'video/x-raw-%s,width=%s,height=%s ! ' % (colorspace, - w, h) + video_size = 'video/x-raw-yuv,width=%s,height=%s ! ' % (w, h) else: video_size = '' self.src_bin = self.make_bin_from_config('video_input_device', diff -r 1e414d1b429c -r 98b1e19ae4a3 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Apr 20 16:15:25 2012 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 20 16:27:30 2012 +0200 @@ -95,7 +95,7 @@ self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' - self.detect_element('ximagesrc', _('Screen')) + # self.devices['screen'] = 'ximagesrc'

class VideoOutputManager(DeviceManager):