Merge pull request #54 from factor18/master

Add ability to scale logo

docs/CONFIG.md

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

ffplayout.yml

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

ffplayout/filters.py

@@ -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:
         logo_chain = []
-        opacity = 'format=rgba,colorchannelmixer=aa={}'.format(
-            _pre_comp.opacity)
+        opacity = 'format=rgba,scale={},colorchannelmixer=aa={}'.format(
+            _pre_comp.logo_scale, _pre_comp.logo_opacity)
         loop = 'loop=loop=-1:size=1:start=0'
         logo_chain.append(
             'movie={},{},{}'.format(_pre_comp.logo, loop, opacity))

ffplayout/utils.py

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