From 2fb1c83c7d5b24cba20a8373ea6ba84f2a1c0574 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 29 Sep 2012 22:26:19 +0200 Subject: added support for audio-resample --- src/flufigut.py | 22 ++++++++++++++++++++++ src/test.json | 8 ++++---- 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/flufigut.py b/src/flufigut.py index 89f30c3..95a0a59 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -138,6 +138,28 @@ for resolution in resolutions: }, } + + +samplerates = [ ] +for encoder in config['encoder']['audio'].keys(): + for audiorate in config['encoder']['audio'][encoder]: + samplerate = config['globals']['audiorates'][audiorate]['samplerate'] + if samplerate not in samplerates: + if config['input']['samplerate'] != samplerate: + samplerates.append(samplerate) + +for samplerate in samplerates: + flow['input']['resample-%s' % samplerate] = { + 'type': 'audio-resample', + 'desc': "resample audio to %s Hz" % samplerate, + 'worker': 'input', + 'feeder': 'raw-input:audio', + 'properties': { + 'samplerate': samplerate, + }, + } + + ### generate encoder components ################################# flow['encoder'] = {} diff --git a/src/test.json b/src/test.json index a895a97..36954e1 100644 --- a/src/test.json +++ b/src/test.json @@ -10,10 +10,10 @@ "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" } + "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" }, -- cgit v1.2.3