From 2ab458ca5331d26fb68584307cbd6c47dac205e9 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <moin@jan-stabenow.de>
Date: Thu, 21 Jul 2022 15:57:46 +0200
Subject: [PATCH] Mod should fix tee_muxer problem with v4l2_h264+audio

---
 src/misc/coders/Encoders/audio/AACAudioToolbox.js  | 2 +-
 src/misc/coders/Encoders/audio/MP3.js              | 2 +-
 src/misc/coders/Encoders/video/Copy.js             | 2 +-
 src/misc/coders/Encoders/video/H264NVENC.js        | 2 --
 src/misc/coders/Encoders/video/H264OMX.js          | 4 ----
 src/misc/coders/Encoders/video/H264V4L2M2M.js      | 2 --
 src/misc/coders/Encoders/video/H264VAAPI.js        | 2 --
 src/misc/coders/Encoders/video/H264VideoToolbox.js | 2 --
 src/misc/coders/Encoders/video/HEVCVAAPI.js        | 2 --
 src/misc/coders/Encoders/video/VP9.js              | 2 --
 src/misc/coders/Encoders/video/VP9VAAPI.js         | 2 --
 src/misc/coders/Encoders/video/X264.js             | 2 --
 src/misc/coders/Encoders/video/X265.js             | 2 --
 src/utils/metadata.js                              | 4 ----
 src/views/Edit/Sources/Raspicam.js                 | 3 +--
 src/views/Edit/Sources/V4L.js                      | 3 +++
 16 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/misc/coders/Encoders/audio/AACAudioToolbox.js b/src/misc/coders/Encoders/audio/AACAudioToolbox.js
index 63e4c90..f96ad23 100644
--- a/src/misc/coders/Encoders/audio/AACAudioToolbox.js
+++ b/src/misc/coders/Encoders/audio/AACAudioToolbox.js
@@ -21,7 +21,7 @@ function createMapping(settings, stream) {
 	}
 
 	const mapping = {
-		global: [],
+		global: [['-vsync', 'drop']],
 		local: local,
 	};
 
diff --git a/src/misc/coders/Encoders/audio/MP3.js b/src/misc/coders/Encoders/audio/MP3.js
index 5543eef..bb69de6 100644
--- a/src/misc/coders/Encoders/audio/MP3.js
+++ b/src/misc/coders/Encoders/audio/MP3.js
@@ -18,7 +18,7 @@ function createMapping(settings, stream) {
 	const local = ['-codec:a', 'libmp3lame', '-b:a', `${settings.bitrate}k`, '-shortest'];
 
 	const mapping = {
-		global: [],
+		global: [['-vsync', 'drop']],
 		local: local,
 	};
 
diff --git a/src/misc/coders/Encoders/video/Copy.js b/src/misc/coders/Encoders/video/Copy.js
index a162fa8..4f636a0 100644
--- a/src/misc/coders/Encoders/video/Copy.js
+++ b/src/misc/coders/Encoders/video/Copy.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 function createMapping(settings) {
-	const local = ['-codec:v', 'copy', '-vsync', 'passthrough', '-copyts', '-start_at_zero'];
+	const local = ['-codec:v', 'copy'];
 
 	const mapping = {
 		global: [],
diff --git a/src/misc/coders/Encoders/video/H264NVENC.js b/src/misc/coders/Encoders/video/H264NVENC.js
index 5ccfb2e..82758a1 100644
--- a/src/misc/coders/Encoders/video/H264NVENC.js
+++ b/src/misc/coders/Encoders/video/H264NVENC.js
@@ -39,8 +39,6 @@ function createMapping(settings) {
 		`${settings.fps}`,
 		'-pix_fmt',
 		'yuv420p',
-		'-vsync',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/H264OMX.js b/src/misc/coders/Encoders/video/H264OMX.js
index 1aa08fc..834fc6a 100644
--- a/src/misc/coders/Encoders/video/H264OMX.js
+++ b/src/misc/coders/Encoders/video/H264OMX.js
@@ -30,10 +30,6 @@ function createMapping(settings) {
 		`${settings.fps}`,
 		'-pix_fmt',
 		'yuv420p',
-		'-vsync',
-		'1',
-		'-zerocopy',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/H264V4L2M2M.js b/src/misc/coders/Encoders/video/H264V4L2M2M.js
index 5604c54..da03a84 100644
--- a/src/misc/coders/Encoders/video/H264V4L2M2M.js
+++ b/src/misc/coders/Encoders/video/H264V4L2M2M.js
@@ -78,8 +78,6 @@ function createMapping(settings) {
 		`${settings.fps}`,
 		'-pix_fmt',
 		'yuv420p',
-		'-vsync',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/H264VAAPI.js b/src/misc/coders/Encoders/video/H264VAAPI.js
index 3480537..4249bb3 100644
--- a/src/misc/coders/Encoders/video/H264VAAPI.js
+++ b/src/misc/coders/Encoders/video/H264VAAPI.js
@@ -49,8 +49,6 @@ function createMapping(settings) {
 		`${settings.fps}`,
 		'-g',
 		`${settings.gop}`,
-		'-vsync',
-		'1'
 	);
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/H264VideoToolbox.js b/src/misc/coders/Encoders/video/H264VideoToolbox.js
index 2ed00a0..52d52bb 100644
--- a/src/misc/coders/Encoders/video/H264VideoToolbox.js
+++ b/src/misc/coders/Encoders/video/H264VideoToolbox.js
@@ -37,8 +37,6 @@ function createMapping(settings) {
 		'yuv420p',
 		'-realtime',
 		'true',
-		'-vsync',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/HEVCVAAPI.js b/src/misc/coders/Encoders/video/HEVCVAAPI.js
index 0380884..f8da554 100644
--- a/src/misc/coders/Encoders/video/HEVCVAAPI.js
+++ b/src/misc/coders/Encoders/video/HEVCVAAPI.js
@@ -49,8 +49,6 @@ function createMapping(settings) {
 		`${settings.fps}`,
 		'-g',
 		`${settings.gop}`,
-		'-vsync',
-		'1'
 	);
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/VP9.js b/src/misc/coders/Encoders/video/VP9.js
index cca572b..d36cd80 100644
--- a/src/misc/coders/Encoders/video/VP9.js
+++ b/src/misc/coders/Encoders/video/VP9.js
@@ -31,8 +31,6 @@ function createMapping(settings) {
 		'0',
 		'-pix_fmt',
 		'yuv420p',
-		'-vsync',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/VP9VAAPI.js b/src/misc/coders/Encoders/video/VP9VAAPI.js
index ad0decf..bd2907d 100644
--- a/src/misc/coders/Encoders/video/VP9VAAPI.js
+++ b/src/misc/coders/Encoders/video/VP9VAAPI.js
@@ -49,8 +49,6 @@ function createMapping(settings) {
 		`${settings.fps}`,
 		'-g',
 		`${settings.gop}`,
-		'-vsync',
-		'1'
 	);
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/X264.js b/src/misc/coders/Encoders/video/X264.js
index c02ad90..dff749c 100644
--- a/src/misc/coders/Encoders/video/X264.js
+++ b/src/misc/coders/Encoders/video/X264.js
@@ -40,8 +40,6 @@ function createMapping(settings) {
 		'0',
 		'-pix_fmt',
 		'yuv420p',
-		'-vsync',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/misc/coders/Encoders/video/X265.js b/src/misc/coders/Encoders/video/X265.js
index c41345e..2563618 100644
--- a/src/misc/coders/Encoders/video/X265.js
+++ b/src/misc/coders/Encoders/video/X265.js
@@ -40,8 +40,6 @@ function createMapping(settings) {
 		'0',
 		'-pix_fmt',
 		'yuv420p',
-		'-vsync',
-		'1',
 	];
 
 	if (settings.gop !== 'auto') {
diff --git a/src/utils/metadata.js b/src/utils/metadata.js
index bf7b1c4..ac49cc4 100644
--- a/src/utils/metadata.js
+++ b/src/utils/metadata.js
@@ -129,9 +129,6 @@ data = {
 					global: [],
 					local: [
 						'-codec:v', 'copy',
-						'-vsync 0',
-						'-copyts',
-						'-start_at_zero',
 					]
 				}
 			},
@@ -163,7 +160,6 @@ data = {
 						'-r', '25',
 						'-g', '50',
 						'-pix_fmt', 'yuv420p',
-						'-vsync', '1',
 						'-profile:v', 'high',
 						'-tune:v', 'zerolatency',
 					]
diff --git a/src/views/Edit/Sources/Raspicam.js b/src/views/Edit/Sources/Raspicam.js
index a4cfd4e..4114dbf 100644
--- a/src/views/Edit/Sources/Raspicam.js
+++ b/src/views/Edit/Sources/Raspicam.js
@@ -41,10 +41,9 @@ const createInputs = (settings) => {
 		options: [],
 	};
 
-	input.options.push('-thread_queue_size', '1024');
+	input.options.push('-thread_queue_size', '512');
 	input.options.push('-re');
 	input.options.push('-r', '' + settings.framerate);
-	input.options.push('-use_wallclock_as_timestamps', '1');
 	input.options.push('-f', 'video4linux2');
 	input.options.push('-framerate', '' + settings.framerate);
 	input.options.push('-video_size', settings.size);
diff --git a/src/views/Edit/Sources/V4L.js b/src/views/Edit/Sources/V4L.js
index 0ac3728..b01f29e 100644
--- a/src/views/Edit/Sources/V4L.js
+++ b/src/views/Edit/Sources/V4L.js
@@ -43,6 +43,9 @@ const createInputs = (settings) => {
 		options: [],
 	};
 
+	input.options.push('-thread_queue_size', '512');
+	input.options.push('-re');
+	input.options.push('-r', '' + settings.framerate);
 	input.options.push('-f', 'video4linux2');
 	input.options.push('-framerate', '' + settings.framerate);
 	input.options.push('-video_size', settings.size);