flow as 4 sections, introducing audiorates

3 files changed, 35 insertions, 5 deletions

diff --git a/src/flufigut.py b/src/flufigut.py
index 7a02696..6a8da24 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -97,16 +97,23 @@ for streamer in config['streamer']:
   idx+=1
 
 ### generate input components ###################################
-# TODO
+data['flow']['input'] = {}
+
+
         
 ### generate encoder components #################################
 # TODO
+data['flow']['encoder'] = {}
+
 
 ### generate muxer components ###################################
 # TODO
+data['flow']['muxer'] = {}
 
 ### generate streamer components ################################
 # TODO
+data['flow']['streamer'] = {}
+
 
 ### initialize and render templates #############################
 #
diff --git a/src/test.json b/src/test.json
index 23f9a18..a895a97 100644
--- a/src/test.json
+++ b/src/test.json
@@ -9,6 +9,12 @@
         "480p25": { "width":  "854", "height": "480", "rate": "25/1" },
         "360p25": { "width":  "640", "height": "360", "rate": "25/1" }
       },
+     "audiorates": {
+        "160@44": { "bitrate": 160, "samplerate": "44100" },
+        "96@44": { "bitrate": 96, "samplerate": "44100" },
+        "160@48": { "bitrate": 160, "samplerate": "48000" },
+        "96@48": { "bitrate": 96, "samplerate": "48000" }
+      },
      "formats": {
         "flash": { "muxer": "flv", "video": "h264", "audio": "aac" },
         "webm": { "muxer": "webm", "video": "vp8", "audio": "vorbis" },
@@ -30,7 +36,8 @@
    },
   "input": {
      "source": "decklink",
-     "resolution": "720p25"
+     "resolution": "720p25",
+     "samplerate": 48000
    },
   "encoder": {
      "video": {
@@ -38,8 +45,8 @@
         "vp8": [ "720p25", "480p25", "360p25" ]
       },
      "audio": {
-        "aac": [ 160, 96 ],
-        "vorbis": [ 160, 96 ]
+        "aac": [ "160@44", "96@44" ],
+        "vorbis": [ "160@48", "96@48" ]
       }
    },
   "muxer": {
diff --git a/templates/example/planet.xml b/templates/example/planet.xml
index ea5d306..0d5e8fc 100644
--- a/templates/example/planet.xml
+++ b/templates/example/planet.xml
@@ -10,7 +10,23 @@
   </atmosphere>
 
   <flow name="{{ globals.name }}">
-{% for name, component in flow.items() %}
+<!-- raw-input, resizing and resampling -->
+{% for name, component in flow['input'].items() %}
+{% include '%s.xml' % component.type %}
+{% endfor %}
+
+<!-- encoding -->
+{% for name, component in flow['encoder'].items() %}
+{% include '%s.xml' % component.type %}
+{% endfor %}
+
+<!-- muxing -->
+{% for name, component in flow['muxer'].items() %}
+{% include '%s.xml' % component.type %}
+{% endfor %}
+
+<!-- streaming -->
+{% for name, component in flow['streamer'].items() %}
 {% include '%s.xml' % component.type %}
 {% endfor %}
   </flow>