changeset 1e414d1b429c in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1e414d1b429c description: add screen sharing ability by choosing Screen in video input device.

diffstat:

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

diffs (41 lines):

diff -r a0560814bf8b -r 1e414d1b429c src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Apr 20 14:34:24 2012 +0200 +++ b/src/common/jingle_rtp.py Fri Apr 20 16:15:25 2012 +0200 @@ -364,9 +364,13 @@ 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-yuv,framerate=%s ! ' % \ - gajim.config.get('video_framerate') + framerate = 'videorate ! video/x-raw-%s,framerate=%s ! ' % \ + (colorspace, gajim.config.get('video_framerate')) else: framerate = '' try: @@ -374,7 +378,8 @@ except: w = h = None if w and h: - video_size = 'video/x-raw-yuv,width=%s,height=%s ! ' % (w, h) + video_size = 'video/x-raw-%s,width=%s,height=%s ! ' % (colorspace, + w, h) else: video_size = '' self.src_bin = self.make_bin_from_config('video_input_device', diff -r a0560814bf8b -r 1e414d1b429c src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Apr 20 14:34:24 2012 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 20 16:15:25 2012 +0200 @@ -95,7 +95,7 @@ self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' - # self.devices['screen'] = 'ximagesrc' + self.detect_element('ximagesrc', _('Screen'))

class VideoOutputManager(DeviceManager):