From 0bd6d41304399355bee24b67a612f912db144f97 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Wed, 15 Dec 2021 20:03:40 +0000
Subject: [PATCH] config/services/kattv{,2}{,-ingest}: Settings adjustment

---
 config/services/kattv-ingest.nix  | 15 ++++++++-------
 config/services/kattv.nix         |  6 ++++++
 config/services/kattv2-ingest.nix |  4 ++--
 config/services/kattv2.nix        |  6 ++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/config/services/kattv-ingest.nix b/config/services/kattv-ingest.nix
index 2a9d06a6..d7c4da9e 100644
--- a/config/services/kattv-ingest.nix
+++ b/config/services/kattv-ingest.nix
@@ -22,7 +22,7 @@ let
   };
   queue_data = {
     element.queue = {
-      leaky = "downstream";
+      #leaky = "downstream";
     };
   };
   videoconvert_cpu = {
@@ -39,19 +39,20 @@ let
     "gldownload"
   ];
   encodeopts = {
-    speed-preset = "ultrafast";
+    speed-preset = "veryfast";
+    ref = 1;
     tune = "zerolatency";
     pass = "qual";
     #psy-tune = "film";
     #noise-reduction=0;
-    quantizer = 27;
-    bitrate = 16384;
+    quantizer = 21;
+    bitrate = 8192;
     rc-lookahead = 6;
   };
   denoise = {
     element.frei0r-filter-hqdn3d = {
-      spatial = 0.175; #0.325;
-      temporal = 0.06; #0.11;
+      spatial = 0.175;
+      temporal = 0.25;
     };
   };
   encode_high = [
@@ -68,8 +69,8 @@ let
     "h264parse"
   ];
   rtmpsink = [
-    queue_data
     "flvmux"
+    queue_data
     {
       element.rtmp2sink = {
         location = "rtmp://localhost:1935/stream/kattv";
diff --git a/config/services/kattv.nix b/config/services/kattv.nix
index 5abeffaa..e3f47a68 100644
--- a/config/services/kattv.nix
+++ b/config/services/kattv.nix
@@ -20,6 +20,11 @@ let
       #extra-controls = "c,exposure_auto=3";
     };
   };
+  queue_data = {
+    element.queue = {
+      leaky = "downstream";
+    };
+  };
   v4l2src = [
     cameracapture
     {
@@ -32,6 +37,7 @@ let
   ];
   pipeline = v4l2src ++ [
     "jpegtrunc"
+    queue_data
     { element.matroskamux.streamable = true; }
     {
       element.tcpclientsink = {
diff --git a/config/services/kattv2-ingest.nix b/config/services/kattv2-ingest.nix
index be3e5975..7729700f 100644
--- a/config/services/kattv2-ingest.nix
+++ b/config/services/kattv2-ingest.nix
@@ -22,7 +22,7 @@ let
   };
   queue_data = {
     element.queue = {
-      leaky = "downstream";
+      #leaky = "downstream";
     };
   };
   videoconvert_cpu = {
@@ -68,8 +68,8 @@ let
     "h264parse"
   ];
   rtmpsink = [
-    queue_data
     "flvmux"
+    queue_data
     {
       element.rtmp2sink = {
         location = "rtmp://localhost:1935/stream/kattv2";
diff --git a/config/services/kattv2.nix b/config/services/kattv2.nix
index f956ac1c..cb06ec9a 100644
--- a/config/services/kattv2.nix
+++ b/config/services/kattv2.nix
@@ -20,6 +20,11 @@ let
       extra-controls = "c,exposure_auto=3";
     };
   };
+  queue_data = {
+    element.queue = {
+      leaky = "downstream";
+    };
+  };
   v4l2src = [
     cameracapture
     {
@@ -32,6 +37,7 @@ let
   ];
   pipeline = v4l2src ++ [
     "jpegtrunc"
+    queue_data
     { element.matroskamux.streamable = true; }
     {
       element.tcpclientsink = {