From a890b9af739665472ec7e7fc031c8a00f57ef7cf Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 12 Oct 2012 03:44:18 +0200
Subject: moved video resize and resample to sperate worker

---
 src/flufigut.py | 12 ++++++++++--
 src/test.json   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/flufigut.py b/src/flufigut.py
index 0a718b3..37d5ee9 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -109,10 +109,14 @@ for format in transcode.keys():
         resolutions.append(resolution)
 
 for resolution in resolutions:
+  if 'resize' not in worker:
+    worker['resize'] = -1
+  else:
+    worker['resize'] = 1
   flow['input']['resize-%s' % resolution] = {
     'type': 'video-resize',
     'desc': "resize video to %sx%s" % (globals['resolutions'][resolution]['width'], globals['resolutions'][resolution]['height']),
-    'worker': 'input',
+    'worker': 'resize',
     'feeder': 'raw-input:video',
     'properties': {
       'width': globals['resolutions'][resolution]['width'],
@@ -121,10 +125,14 @@ for resolution in resolutions:
     }
 
 for samplerate in samplerates:
+  if 'resample' not in worker:
+    worker['resample'] = -1
+  else:
+    worker['resample'] = 1
   flow['input']['resample-%s' % samplerate] = {
     'type': 'audio-resample',
     'desc': "resample audio to %s Hz" % samplerate,
-    'worker': 'input',
+    'worker': 'resample',
     'feeder': 'raw-input:audio',
     'properties': {
       'samplerate': samplerate,
diff --git a/src/test.json b/src/test.json
index 3342167..48fcc18 100644
--- a/src/test.json
+++ b/src/test.json
@@ -32,7 +32,7 @@
         "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
       },
      "machines": {
-       "titan": [ "input", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96",
+       "titan": [ "input", "resample", "resize", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96",
                   "muxer-flash-high", "muxer-flash-medium", "muxer-flash-low", "muxer-webm-high",
                   "muxer-webm-medium", "muxer-webm-low", "muxer-ogg-audio-high", "streamer-local1" ],
        "calypso": [ "encoder-h264-720p25", "encoder-h264-480p25", "encoder-h264-360p25" ],
-- 
cgit v1.2.3