djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ability to scale logo

Browse Source
This commit is contained in:
Sarat Chandra Balla 2020-05-30 04:05:36 +05:30
parent 21e020c150
commit 2e425184f6
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/CONFIG.md
View File

@ -58,6 +58,7 @@ pre_compress:
fps: 25 fps: 25
add_logo: True add_logo: True
logo: "docs/logo.png" logo: "docs/logo.png"
logo_scale: "100:-1"
logo_opacity: 0.7 logo_opacity: 0.7
logo_filter: "overlay=W-w-12:12" logo_filter: "overlay=W-w-12:12"
add_loudnorm: False add_loudnorm: False
@ -69,6 +70,7 @@ pre_compress:
ffmpeg pre-compression settings, all clips get prepared in that way, ffmpeg pre-compression settings, all clips get prepared in that way,
so the input for the final compression is unique. so the input for the final compression is unique.
- `aspect` mus be a float number. - `aspect` mus be a float number.
- with `logo_scale = 100:-1` logo can be scaled
- with `logo_opacity` logo can make transparent - with `logo_opacity` logo can make transparent
- with `logo_filter = overlay=W-w-12:12` you can modify the logo position - 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 - with use_loudnorm you can activate single pass EBU R128 loudness normalization

1
ffplayout.yml
View File

@ -43,6 +43,7 @@ pre_compress:
fps: 25 fps: 25
add_logo: True add_logo: True
logo: "docs/logo.png" logo: "docs/logo.png"
logo_scale: "100:-1"
logo_opacity: 0.7 logo_opacity: 0.7
logo_filter: "overlay=W-w-12:12" logo_filter: "overlay=W-w-12:12"
add_loudnorm: False add_loudnorm: False

4
ffplayout/filters.py
View File

@ -119,8 +119,8 @@ def overlay_filter(duration, ad, ad_last, ad_next):
if _pre_comp.add_logo and os.path.isfile(_pre_comp.logo) and not ad: if _pre_comp.add_logo and os.path.isfile(_pre_comp.logo) and not ad:
logo_chain = [] logo_chain = []
opacity = 'format=rgba,colorchannelmixer=aa={}'.format( opacity = 'format=rgba,scale={},colorchannelmixer=aa={}'.format(
_pre_comp.opacity) _pre_comp.logo_scale, _pre_comp.logo_opacity)
loop = 'loop=loop=-1:size=1:start=0' loop = 'loop=loop=-1:size=1:start=0'
logo_chain.append( logo_chain.append(
'movie={},{},{}'.format(_pre_comp.logo, loop, opacity)) 'movie={},{},{}'.format(_pre_comp.logo, loop, opacity))

3
ffplayout/utils.py
View File

@ -159,7 +159,7 @@ def load_config():
else: else:
p_start = str_to_sec(cfg['playlist']['day_start']) p_start = str_to_sec(cfg['playlist']['day_start'])
if not p_start: if p_start is None:
p_start = get_time('full_sec') p_start = get_time('full_sec')
if stdin_args.length: if stdin_args.length:
@ -180,6 +180,7 @@ def load_config():
_pre_comp.add_logo = cfg['pre_compress']['add_logo'] _pre_comp.add_logo = cfg['pre_compress']['add_logo']
_pre_comp.logo = cfg['pre_compress']['logo'] _pre_comp.logo = cfg['pre_compress']['logo']
_pre_comp.logo_scale = cfg['pre_compress']['logo_scale']
_pre_comp.opacity = cfg['pre_compress']['logo_opacity'] _pre_comp.opacity = cfg['pre_compress']['logo_opacity']
_pre_comp.logo_filter = cfg['pre_compress']['logo_filter'] _pre_comp.logo_filter = cfg['pre_compress']['logo_filter']
_pre_comp.add_loudnorm = cfg['pre_compress']['add_loudnorm'] _pre_comp.add_loudnorm = cfg['pre_compress']['add_loudnorm']