From a29d3b9c38c3bb815de6fb7c683e31405a85188b Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 20 Apr 2012 16:27:30 +0200 Subject: [PATCH] Backed out changeset 1e414d1b429c --- src/common/jingle_rtp.py | 11 +++-------- src/common/multimedia_helpers.py | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/jingle_rtp.py b/src/common/jingle_rtp.py index 628349665..4e552dbb1 100644 --- a/src/common/jingle_rtp.py +++ b/src/common/jingle_rtp.py @@ -364,13 +364,9 @@ class JingleVideo(JingleRTPContent): 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 @@ class JingleVideo(JingleRTPContent): 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 --git a/src/common/multimedia_helpers.py b/src/common/multimedia_helpers.py index 157f0abe3..6aabbfb3d 100644 --- a/src/common/multimedia_helpers.py +++ b/src/common/multimedia_helpers.py @@ -95,7 +95,7 @@ class VideoInputManager(DeviceManager): 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):