From d4f8f25d653b29455a848e0dcfedfe48bd861aa9 Mon Sep 17 00:00:00 2001
From: Jan Stabenow <moin@jan-stabenow.de>
Date: Mon, 18 Jul 2022 11:51:34 +0200
Subject: [PATCH] Fix discards filter options if coder=copy + replaces 'none'
 with 'inherit'

---
 src/misc/filters/audio/Pan.js    | 18 +++++++++++-------
 src/misc/filters/audio/Volume.js |  8 ++++----
 src/utils/metadata.js            |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/misc/filters/audio/Pan.js b/src/misc/filters/audio/Pan.js
index a3fabc6..8e14e18 100644
--- a/src/misc/filters/audio/Pan.js
+++ b/src/misc/filters/audio/Pan.js
@@ -12,7 +12,7 @@ import Select from '../../Select';
 
 function init(initialState) {
 	const state = {
-		value: 'none',
+		value: 'inherit',
 		...initialState,
 	};
 
@@ -43,9 +43,15 @@ function Pan(props) {
 	return (
 		<React.Fragment>
 			<Select label={<Trans>Pan</Trans>} value={props.value} onChange={props.onChange}>
-				<MenuItem value="none"><Trans>None</Trans></MenuItem>
-				<MenuItem value="mute_left"><Trans>Mute left</Trans></MenuItem>
-				<MenuItem value="mute_right"><Trans>Mute right</Trans></MenuItem>
+				<MenuItem value="inherit">
+					<Trans>Inherit</Trans>
+				</MenuItem>
+				<MenuItem value="mute_left">
+					<Trans>Mute left</Trans>
+				</MenuItem>
+				<MenuItem value="mute_right">
+					<Trans>Mute right</Trans>
+				</MenuItem>
 			</Select>
 			<Typography variant="caption">
 				<Trans>Mute a channel.</Trans>
@@ -107,9 +113,7 @@ const type = 'audio';
 const hwaccel = false;
 
 function summarize(settings) {
-
-
-	return `${name} (${settings.value.replace(/_/i, " ")})`;
+	return `${name} (${settings.value.replace(/_/i, ' ')})`;
 }
 
 function defaults() {
diff --git a/src/misc/filters/audio/Volume.js b/src/misc/filters/audio/Volume.js
index 7e606eb..5a476a4 100644
--- a/src/misc/filters/audio/Volume.js
+++ b/src/misc/filters/audio/Volume.js
@@ -12,7 +12,7 @@ import Select from '../../Select';
 
 function init(initialState) {
 	const state = {
-		level: 'none',
+		level: 'inherit',
 		db: 0,
 		...initialState,
 	};
@@ -26,7 +26,7 @@ function createGraph(settings) {
 	const mapping = [];
 
 	switch (settings.level) {
-		case 'none':
+		case 'inherit':
 			break;
 		case 'custom':
 			mapping.push(`volume=volume=${settings.db}dB`);
@@ -42,8 +42,8 @@ function createGraph(settings) {
 function VolumeLevel(props) {
 	return (
 		<Select label={<Trans>Volume</Trans>} value={props.value} onChange={props.onChange}>
-			<MenuItem value="none">
-				<Trans>None</Trans>
+			<MenuItem value="inherit">
+				<Trans>Inherit</Trans>
 			</MenuItem>
 			<MenuItem value="10">10%</MenuItem>
 			<MenuItem value="20">20%</MenuItem>
diff --git a/src/utils/metadata.js b/src/utils/metadata.js
index bfc218c..bf7b1c4 100644
--- a/src/utils/metadata.js
+++ b/src/utils/metadata.js
@@ -647,7 +647,7 @@ const createInputsOutputs = (sources, profiles) => {
 
 		const local = profile.video.encoder.mapping.local.slice();
 
-		if (profile.video.filter.graph.length !== 0) {
+		if (profile.video.encoder.coder !== 'copy' && profile.video.filter.graph.length !== 0) {
 			// Check if there's already a video filter in the local mapping
 			let filterIndex = local.indexOf('-filter:v');
 			if (filterIndex !== -1) {
@@ -681,7 +681,7 @@ const createInputsOutputs = (sources, profiles) => {
 
 			const local = profile.audio.encoder.mapping.local.slice();
 
-			if (profile.audio.filter.graph.length !== 0) {
+			if (profile.audio.encoder.coder !== 'copy' && profile.audio.filter.graph.length !== 0) {
 				// Check if there's already a audio filter in the local mapping
 				let filterIndex = local.indexOf('-filter:a');
 				if (filterIndex !== -1) {