Merge branch 'framerate' into 'master'

Create a global framerate parameter

Closes #15

See merge request debconf-video-team/ansible!29

Author: baldurmen

inventory/group_vars/all

@@ -2,7 +2,7 @@
 user_name: videoteam
 storage_username: videodata
 # crypt(3)ed password. e.g. echo -e changeme | mkpasswd -s -m SHA-512
-# mkpasswd is part of the wois package on Debian
+# mkpasswd is part of the whois package on Debian
 user_password_crypted: $6$XQpHonFCApiFLfBJ$jlZu.ywm0Tfeiv87gG8nDUPyChyJjYRO3.O/VEK7w2Ywqqc5lKf1vDKN0UEs1b5Co6SnCaOXcc/jXNCuOk0EH/
 autologin: true
 
@@ -15,14 +15,9 @@ time_zone: Europe/Brussels
 
 enable_oldstable: true
 
-# check the frequency setting on the camera
-# make sure it matches what's the frequency of the local power
-# use BlackmagicDesktopVideoSetup to see what the camera is sending
-# 720p59.94 is 18
-# 720p50 is 17
-# also change voctomix framerate below to match
-# list of all mode IDs: check 'gst-inspect-1.0 decklinkvideosrc'
-blackmagic_default_mode: 17
+# Local frequency setting, in Hz
+# This can be either 50 or 60Hz
+frequency: 50
 
 # To enable proprietary drivers, provide a URL to them.
 #blackmagic:
@@ -33,7 +28,6 @@ blackmagic_default_mode: 17
 
 voctomix:
   display_system: gl
-  framerate: 25
 #  loop_url: http://10.18.0.1/loop/loop.ts
 #  bgloop_url: http://10.18.0.1/loop/bgloop.ts
 

inventory/host_vars/voctomix1.yml

@@ -13,7 +13,6 @@ blackmagic_sources:
   # 720p59.94 is 18
   # 720p50 is 17
   # list of all mode IDs: check 'gst-inspect-1.0 decklinkvideosrc'
-  mode: "{{ blackmagic_default_mode }}"
 
 voctolights:
 - camera: Cam1

roles/voctomix/README.md

@@ -37,14 +37,17 @@ Main variables are :
 * `room_name`:                           Name of the room where you are
                                          recording. Used in the video file path.
 
+* `frequency`:                           The local frequency setting (50 or 60Hz).
+                                         Used to derive sensible defaults.
+
 * `sources`:                             List. Name of the different sources you
                                          want voctomix to use.
 
 * `voctomix.display_system`:             Rendering API (OpenGl, Vulkan, etc.) to
                                          use.
 
 * `voctomix.framerate`:                  Integer. Number of frames per second to
-                                         record at.
+                                         record at.  Defaults to `frequency/2`
 
 * `voctomix.loop_url`:                   URL of the sponsor loop .ts file.
 
@@ -70,6 +73,9 @@ Main variables are :
 * `streaming.rtmp.vaapi`:                Boolean. Use HW-accelerated x264
                                          encoder.
 
+* `blackmagic_default_mode`:             Default value for `blackmagic_sources.*.mode`,
+                                         computed from `framerate`.
+
 * `blackmagic_sources.*`:                Array. Uses the `card`, `connection`,
                                          `audio` and `mode` parameters as
                                          described below. The exact syntax is
@@ -87,6 +93,7 @@ Main variables are :
                                          card. You can get a list of the
                                          different modes by running
                                          `gst-inspect-1.0 decklinkvideosrc`.
+                                         Defaults to `blackmagic_default_mode`.
 
 * `rsync_excludes`:                      List. Paths to exclude during the rsync
                                          copy of the video files.

roles/voctomix/defaults/main.yml

@@ -14,7 +14,7 @@ sources:
 
 voctomix:
   display_system: gl
-  framerate: 25
+  framerate: "{{ frequency / 2 }}"
   # loop_url: http://example.net/loop.tar.xz
 
 streaming:
@@ -43,3 +43,16 @@ rsync_sshopts: ""
 # - camera: Cam1
 #   port: /dev/ttyUSB0
 #   host: localhost
+
+# check the frequency setting on the camera
+# make sure it matches what's the frequency of the local power
+# use BlackmagicDesktopVideoSetup to see what the camera is sending
+# list of all mode IDs: check 'gst-inspect-1.0 decklinkvideosrc'
+frequency_parameters:
+  50:
+    mode: 17  # 720p50
+
+  60:
+    mode: 18  # 720p59.94
+
+blackmagic_default_mode: "{{ framerate_parameters[frequency].mode }}"

roles/voctomix/templates/videoteam-capture-blackmagic.service.j2

@@ -16,9 +16,7 @@ ExecStart=/usr/bin/voctomix-ingest -v \
 {% elif item.1.connection == 'SDI' -%}
     connection=1 \
 {% endif -%}
-{% if item.1.mode is defined -%}
-    mode={{ item.1.mode }} \
-{% endif -%}
+    mode={{ item.1.mode | default(blackmagic_default_mode) }} \
     ' \
 {% if item.1.audio -%}
   --audio-source blackmagic \