From 7af6e527848993e472d970b67662a49d681a12b6 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 23 Oct 2012 00:34:39 +0200 Subject: not so many worker... --- src/flufigut.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flufigut.py b/src/flufigut.py index 4634ccc..619fbec 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -195,7 +195,7 @@ if output_format == 'flumotion': feeder = 'input-%s' % (mux[mux_name]['audio']) audio_encoder = 'encode-%s-%s-%i-%i' % (source, encoder, bitrate, samplerate) if audio_encoder not in flow['encoder_audio']: - worker_name = 'encoder-%s-%s-%s' % (source, encoder, bitrate) + worker_name = 'encoder-%s-%s' % (source, encoder) if worker_name not in worker: worker[worker_name] = -1 else: @@ -223,7 +223,7 @@ if output_format == 'flumotion': feeder = 'input-%s' % (mux[mux_name]['video']) video_encoder = 'encode-%s-%s-%s' % (source, encoder, resolution) if video_encoder not in flow['encoder_video'].keys(): - worker_name = 'encoder-%s-%s-%s' % (source, encoder, resolution) + worker_name = 'encoder-%s-%s' % (source, encoder) if worker_name not in worker: worker[worker_name] = -1 else: @@ -239,7 +239,7 @@ if output_format == 'flumotion': } muxer = globals['formats'][format]['muxer'] - worker_name = 'muxer-%s-%s-%s' % (mux_name, format, profile) + worker_name = 'muxer-%s-%s' % (mux_name, format) if worker_name not in worker: worker[worker_name] = -1 else: -- cgit v1.2.3 From 5d7bbf466715bb05b8428b57cff1d58c2f8c8095 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 23 Oct 2012 00:37:45 +0200 Subject: fixed hls stream base url --- contrib/hls/start-hls.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hls/start-hls.sh b/contrib/hls/start-hls.sh index 418416e..b2a985e 100755 --- a/contrib/hls/start-hls.sh +++ b/contrib/hls/start-hls.sh @@ -25,7 +25,7 @@ src="http://localhost:8000/$2-flash-$quality.flv" segmenter="/usr/local/bin/m3u8-segmenter" len=3 num=3 -url="http://r38.realraum.at/" +url="http://elevate-live.spreadspace.org/" case "$3" in high) -- cgit v1.2.3