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

Fix video output pipeline, and improve error dialog. fixes #5482

This commit is contained in:
Thibaut GIRKA 2009-12-03 23:07:45 +01:00
parent 9914792723
commit 594072999c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/jingle_rtp.py
View File

@ -89,15 +89,16 @@ class JingleRTPContent(JingleContent):
and self.p2psession.get_property('codecs-ready')) and self.p2psession.get_property('codecs-ready'))
def make_bin_from_config(self, config_key, pipeline, text): def make_bin_from_config(self, config_key, pipeline, text):
pipeline = pipeline % gajim.config.get(config_key)
try: try:
bin = gst.parse_bin_from_description(pipeline bin = gst.parse_bin_from_description(pipeline, True)
% gajim.config.get(config_key), True)
return bin return bin
except GError, error_str: except GError, error_str:
self.session.connection.dispatch('ERROR', self.session.connection.dispatch('ERROR',
(_("%s configuration error") % text.capitalize(), (_("%s configuration error") % text.capitalize(),
_("Couldn't setup %s. Check your configuration.\n\nError was:\n%s") _("Couldn't setup %s. Check your configuration.\n\n"
% (text, error_str))) "Pipeline was:\n%s\n\n"
"Error was:\n%s") % (text, pipeline, error_str)))
raise JingleContentSetupException raise JingleContentSetupException
def add_remote_candidates(self, candidates): def add_remote_candidates(self, candidates):
@ -321,7 +322,7 @@ class JingleVideo(JingleRTPContent):
#src_bin.link(caps) #src_bin.link(caps)
self.sink = self.make_bin_from_config('video_output_device', self.sink = self.make_bin_from_config('video_output_device',
'%s ! videoscale ! ffmpegcolorspace', _("video output")) 'videoscale ! ffmpegcolorspace ! %s', _("video output"))
self.pipeline.add(self.sink) self.pipeline.add(self.sink)
src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad')) src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad'))