copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Backed out changeset 1e414d1b429c

Browse source
This commit is contained in:
Yann Leboulanger 2012-04-20 16:27:30 +02:00
parent c1584918f3
commit a29d3b9c38
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/jingle_rtp.py
View file

@ -364,13 +364,9 @@ class JingleVideo(JingleRTPContent):
JingleRTPContent.setup_stream(self, self._on_src_pad_added) JingleRTPContent.setup_stream(self, self._on_src_pad_added)
# the local parts # the local parts
if gajim.config.get('video_input_device').startswith('ximagesrc'):
colorspace = 'rgb'
else:
colorspace = 'yuv'
if gajim.config.get('video_framerate'): if gajim.config.get('video_framerate'):
framerate = 'videorate ! video/x-raw-%s,framerate=%s ! ' % \ framerate = 'videorate ! video/x-raw-yuv,framerate=%s ! ' % \
(colorspace, gajim.config.get('video_framerate')) gajim.config.get('video_framerate')
else: else:
framerate = '' framerate = ''
try: try:
@ -378,8 +374,7 @@ class JingleVideo(JingleRTPContent):
except: except:
w = h = None w = h = None
if w and h: if w and h:
video_size = 'video/x-raw-%s,width=%s,height=%s ! ' % (colorspace, video_size = 'video/x-raw-yuv,width=%s,height=%s ! ' % (w, h)
w, h)
else: else:
video_size = '' video_size = ''
self.src_bin = self.make_bin_from_config('video_input_device', self.src_bin = self.make_bin_from_config('video_input_device',

2
src/common/multimedia_helpers.py
View file

@ -95,7 +95,7 @@ class VideoInputManager(DeviceManager):
self.detect_element('v4l2src', _('V4L2: %s')) self.detect_element('v4l2src', _('V4L2: %s'))
# Funny things, just to test... # Funny things, just to test...
# self.devices['GOOM'] = 'audiotestsrc ! goom' # self.devices['GOOM'] = 'audiotestsrc ! goom'
self.detect_element('ximagesrc', _('Screen')) # self.devices['screen'] = 'ximagesrc'
class VideoOutputManager(DeviceManager): class VideoOutputManager(DeviceManager):