diff --git a/ffplayout.yml b/ffplayout.yml index 12423aab..eee6b81e 100644 --- a/ffplayout.yml +++ b/ffplayout.yml @@ -31,18 +31,19 @@ logging: log_level: "DEBUG" ffmpeg_level: "ERROR" -pre_process: - helptext: Settings for the pre_process. All clips get prepared in that way, - so the input for the final compression is unique. 'aspect' must be a float - number. 'logo' is only used if the path exist. 'logo_scale' scale the logo to - target size, leave it blank when no scaling is needed, format is 'number:number', - for example '100:-1' for proportional scaling. With 'logo_opacity' logo can - become transparent. With 'logo_filter' 'overlay=W-w-12:12' you can modify - the logo position. With 'use_loudnorm' you can activate single pass EBU R128 - loudness normalization. 'loud_*' can adjust the loudnorm filter. 'output_count' - sets the outputs for the filtering, > 1 gives the option to use the same filters - for multiple outputs. This outputs can be taken in 'ffmpeg_param', names will be - vout2, vout3; aout2, aout3 etc. +processing: + helptext: Default processing, for all clips that they get prepared in that way, + so the output is unique. 'aspect' must be a float number. 'logo' is only used + if the path exist. 'logo_scale' scale the logo to target size, leave it blank + when no scaling is needed, format is 'number:number', for example '100:-1' + for proportional scaling. With 'logo_opacity' logo can become transparent. + With 'logo_filter' 'overlay=W-w-12:12' you can modify the logo position. + With 'use_loudnorm' you can activate single pass EBU R128 loudness normalization. + 'loud_*' can adjust the loudnorm filter. 'output_count' sets the outputs for + the filtering, > 1 gives the option to use the same filters for multiple outputs. + This outputs can be taken in 'ffmpeg_param', names will be vout2, vout3; + aout2, aout2 etc.'use_realtime' is realtime filter, it works not in all scenarios, + but for example is necessary for hls output. width: 1024 height: 576 aspect: 1.778 @@ -57,9 +58,10 @@ pre_process: loud_TP: -1.5 loud_LRA: 11 output_count: 1 + use_realtime: false playlist: - helptext: Set 'playlist_mode' to 'False' if you want to play clips from the [STORAGE] + helptext: Set 'playlist_mode' to 'False' if you want to play clips from the 'storage' section. Put only the root path here, for example '/playlists' subfolders are readed by the script. Subfolders needs this structur '/playlists/2018/01' (/playlists/year/month). 'day_start' means at which time the playlist should diff --git a/ffplayout/utils.py b/ffplayout/utils.py index 4b85d2e7..5064cbec 100644 --- a/ffplayout/utils.py +++ b/ffplayout/utils.py @@ -179,16 +179,16 @@ def load_config(): _mail.recip = cfg['mail']['recipient'] _mail.level = cfg['mail']['mail_level'] - _pre.add_logo = cfg['pre_process']['add_logo'] - _pre.logo = cfg['pre_process']['logo'] - _pre.logo_scale = cfg['pre_process']['logo_scale'] - _pre.logo_filter = cfg['pre_process']['logo_filter'] - _pre.logo_opacity = cfg['pre_process']['logo_opacity'] - _pre.add_loudnorm = cfg['pre_process']['add_loudnorm'] - _pre.loud_i = cfg['pre_process']['loud_I'] - _pre.loud_tp = cfg['pre_process']['loud_TP'] - _pre.loud_lra = cfg['pre_process']['loud_LRA'] - _pre.output_count = cfg['pre_process']['output_count'] + _pre.add_logo = cfg['processing']['add_logo'] + _pre.logo = cfg['processing']['logo'] + _pre.logo_scale = cfg['processing']['logo_scale'] + _pre.logo_filter = cfg['processing']['logo_filter'] + _pre.logo_opacity = cfg['processing']['logo_opacity'] + _pre.add_loudnorm = cfg['processing']['add_loudnorm'] + _pre.loud_i = cfg['processing']['loud_I'] + _pre.loud_tp = cfg['processing']['loud_TP'] + _pre.loud_lra = cfg['processing']['loud_LRA'] + _pre.output_count = cfg['processing']['output_count'] _playlist.mode = cfg['playlist']['playlist_mode'] _playlist.path = cfg['playlist']['path'] @@ -212,12 +212,13 @@ def load_config(): _log.level = cfg['logging']['log_level'] _log.ff_level = cfg['logging']['ffmpeg_level'] - _pre.w = cfg['pre_process']['width'] - _pre.h = cfg['pre_process']['height'] - _pre.aspect = cfg['pre_process']['aspect'] - _pre.fps = cfg['pre_process']['fps'] - _pre.v_bitrate = cfg['pre_process']['width'] * 50 - _pre.v_bufsize = cfg['pre_process']['width'] * 50 / 2 + _pre.w = cfg['processing']['width'] + _pre.h = cfg['processing']['height'] + _pre.aspect = cfg['processing']['aspect'] + _pre.fps = cfg['processing']['fps'] + _pre.v_bitrate = cfg['processing']['width'] * 50 + _pre.v_bufsize = cfg['processing']['width'] * 50 / 2 + _pre.realtime = cfg['processing']['use_realtime'] _playout.mode = cfg['out']['mode'] _playout.name = cfg['out']['service_name']