From 8ee529c695541277234c77d2927d40b52825bf6a Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 9 Apr 2020 20:56:16 +0200 Subject: [PATCH] modify ffmpeg param: use string instead of an object --- ffplayout.yml | 28 ++++++++++++++-------------- ffplayout/utils.py | 15 ++------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/ffplayout.yml b/ffplayout.yml index 3194bcd1..170fcc89 100644 --- a/ffplayout.yml +++ b/ffplayout.yml @@ -127,18 +127,18 @@ out: preview: False service_name: "Live Stream" service_provider: "example.org" - post_ffmpeg_param: - c:v: "libx264" - crf: "23" - x264-params: "keyint=50:min-keyint=25:scenecut=-1" - maxrate: "1300k" - bufsize: "2600k" - preset: "medium" - profile:v: "Main" - level: "3.1" - c:a: "aac" - ar: "44100" - b:a: "128k" - flags: +global_header - f: "flv" + post_ffmpeg_param: >- + -c:v libx264 + -crf 23 + -x264-params keyint=50:min-keyint=25:scenecut=-1 + -maxrate 1300k + -bufsize 2600k + -preset medium + -profile:v Main + -level 3.1 + -c:a aac + -ar 44100 + -b:a 128k + -flags +global_header + -f flv out_addr: "rtmp://localhost/live/stream" diff --git a/ffplayout/utils.py b/ffplayout/utils.py index b10e245f..0c3f7942 100644 --- a/ffplayout/utils.py +++ b/ffplayout/utils.py @@ -140,17 +140,6 @@ def read_config(path): return yaml.safe_load(config_file) -def dict_to_list(d): - li = [] - - for key, value in d.items(): - if value: - li += ['-{}'.format(key), str(value)] - else: - li += ['-{}'.format(key)] - return li - - def load_config(): """ this function can reload most settings from configuration file, @@ -228,8 +217,8 @@ def load_config(): _playout.preview = cfg['out']['preview'] _playout.name = cfg['out']['service_name'] _playout.provider = cfg['out']['service_provider'] - _playout.post_comp_param = dict_to_list( - cfg['out']['post_ffmpeg_param']) + print(cfg['out']['post_ffmpeg_param'].split(' ')) + _playout.post_comp_param = cfg['out']['post_ffmpeg_param'].split(' ') _playout.out_addr = cfg['out']['out_addr'] _init.load = False