martijnberger

diff --git a/tools/vmaf-runner/Dockerfile b/tools/vmaf-runner/Dockerfile
index e0793e8..38f53c6 100644
--- a/tools/vmaf-runner/Dockerfile
+++ b/tools/vmaf-runner/Dockerfile
@@ -5,7 +5,9 @@
 # https://hub.docker.com/r/jrottenberg/ffmpeg/
 #
 #
-FROM        ubuntu:16.04 AS base
+FROM        ubuntu:20.04 AS base

martijnberger

diff --git a/src/file_io/incaGstUtils.cpp b/src/file_io/incaGstUtils.cpp
index f564c9fd4..d54c5ba9a 100644
--- a/src/file_io/incaGstUtils.cpp
+++ b/src/file_io/incaGstUtils.cpp
@@ -219,6 +219,7 @@ void gstSetHardOMXH264Settings(GstElement* encoder, uint bitrate, uint iframeInt
     if (profile >= 2) {
         cabacEntropyCodingEnabled = true; //CABAC entropy encoding mode, supported at Main or High profile
     }
+    profile = (profile == 4) ? 8 : profile; // We use v4l based settings
     g_object_set(encoder,

martijnberger

diff --git a/provisioning/src/tasks/camera_configuration/mod.rs b/provisioning/src/tasks/camera_configuration/mod.rs
index 713b249..c7b7c53 100644
--- a/provisioning/src/tasks/camera_configuration/mod.rs
+++ b/provisioning/src/tasks/camera_configuration/mod.rs
@@ -19,14 +19,14 @@ use configure_video_drivers::ConfigureVideoDrivers;
 use configure_wifi::ConfigureWifi;
 
 pub fn get_ssd_configuration_task() -> Vec<Box<dyn Task>> {
-    vec![Box::from(ConfigureSsd {})]
+    vec![/*Box::from(ConfigureSsd {})*/]

martijnberger

diff -ur ../linux-4.19.206/drivers/net/wireless/marvell/mwifiex/11n_aggr.c drivers/net/wireless/marvell/mwifiex/11n_aggr.c
--- ../linux-4.19.206/drivers/net/wireless/marvell/mwifiex/11n_aggr.c	2021-09-03 07:58:03.000000000 +0000
+++ drivers/net/wireless/marvell/mwifiex/11n_aggr.c	2021-09-07 12:49:56.000000000 +0000
@@ -62,7 +62,7 @@
 	};
 	struct tx_packet_hdr *tx_header;
 
-	tx_header = skb_put(skb_aggr, sizeof(*tx_header));
+	tx_header = (void *)skb_put(skb_aggr, sizeof(*tx_header));
 

martijnberger

commit 2af90f1ab6dc6ef8079bfec80c616cb408db6acf
Author: Martijn Berger <martijn@hudl.com>
Date:   Wed Jun 2 17:18:30 2021 +0200

    Add special FC110 based 2 camera experimental unit

diff --git a/src/Hudl.AutomaticCapture/Utility/InstallationModelUtility.cs b/src/Hudl.AutomaticCapture/Utility/InstallationModelUtility.cs
index 048ab43b9..7d9aa263f 100644
--- a/src/Hudl.AutomaticCapture/Utility/InstallationModelUtility.cs
+++ b/src/Hudl.AutomaticCapture/Utility/InstallationModelUtility.cs

martijnberger

diff --git a/incatest/requirements.txt b/incatest/requirements.txt
index d7d8d4cac..4d9d7850b 100644
--- a/incatest/requirements.txt
+++ b/incatest/requirements.txt
@@ -1,24 +1,24 @@
-asn1crypto==0.24.0
+asn1crypto==1.4.0
 attrs==21.2.0
 backcall==0.2.0
-certifi==2018.1.18

martijnberger

#!/usr/bin/env python3
import requests
import json
from slack_sdk import WebClient
from slack_sdk.errors import SlackApiError
import dateutil.parser
from datetime import datetime, timezone, timedelta
import boto3
import os
import re

martijnberger

commit f3fdd766832f9b72b2781cfbcaf26f42d731124d
Author: Tim-Philipp Müller <tim@centricular.com>
Date:   Tue Jul 7 19:55:00 2020 +0100

    rtmp, transcodebin: fix i18n header includes
    
    Fixes #1351
    
    Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1416>

martijnberger

commit 10c6262179ee66ff03ed7dbebf46068b89db93b0
Author: Sebastian Dröge <sebastian@centricular.com>
Date:   Sun Nov 1 10:30:27 2020 +0200

    flvmux: Release pads via GstAggregator
    
    See https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/797
    
    Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/803>

martijnberger

import os
import time
import binascii

def generate():
    timestamp = "{:x}".format(int(time.time()))
    rest = binascii.b2a_hex(os.urandom(8)).decode("ascii")
    return timestamp + rest

generate()