Skip to content

Commit

Permalink
#835 apply the low-latency options (ugly!)
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@9382 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 15, 2015
1 parent daaced2 commit 5bd6fa0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/xpra/sound/src.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from xpra.sound.sound_pipeline import SoundPipeline, gobject
from xpra.gtk_common.gobject_util import n_arg_signal
from xpra.sound.gstreamer_util import plugin_str, get_encoder_formatter, get_source_plugins, get_queue_time, normv, \
MP3, CODECS, CODEC_ORDER, QUEUE_LEAK, ENCODER_NEEDS_AUDIOCONVERT
MP3, CODECS, CODEC_ORDER, QUEUE_LEAK, ENCODER_DEFAULT_OPTIONS, ENCODER_NEEDS_AUDIOCONVERT
from xpra.log import Logger
log = Logger("sound")

Expand Down Expand Up @@ -52,7 +52,8 @@ def __init__(self, src_type=None, src_options={}, codecs=CODECS, codec_options={
SoundPipeline.__init__(self, codec)
self.src_type = src_type
source_str = plugin_str(src_type, src_options)
encoder_str = plugin_str(encoder, codec_options)
#FIXME: this is ugly and relies on the fact that we don't pass any codec options to work!
encoder_str = plugin_str(encoder, codec_options or ENCODER_DEFAULT_OPTIONS.get(encoder, {}))
pipeline_els = [source_str]
if encoder in ENCODER_NEEDS_AUDIOCONVERT:
pipeline_els += ["audioconvert"]
Expand Down

0 comments on commit 5bd6fa0

Please sign in to comment.