Merge pull request #235 from tv2/SOF-1824/evsIsIngestedIncorrectly

SOF-1824 Add 1/2 audio track to ingested EVS
tv2 · Mar 19, 2024 · 5c2495e · 5c2495e
2 parents f0e3f43 + ededde5
commit 5c2495e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src/tv2-common/inewsConversion/converters/ParseBody.ts b/src/tv2-common/inewsConversion/converters/ParseBody.ts
@@ -675,19 +675,20 @@ export function getSourceDefinition(typeStr: string): SourceDefinition | undefin
 		}
 	} else if (EVS_RED_TEXT.test(typeStr)) {
 		const strippedToken = typeStr.match(EVS_RED_TEXT)
-		const id = `EVS ${strippedToken![1].toUpperCase()}`
-		const vo = strippedToken![2]
+		const name: string = `EVS ${strippedToken![1].toUpperCase()}`
+		const audioTrack: string = '1/2'
+		const vo: string = strippedToken![2]
 		return {
 			sourceType: SourceType.REPLAY,
-			id,
+			id: `${name} ${audioTrack}`,
 			vo: !!vo,
 			raw: strippedToken![0].trim(),
-			name: `${id}${vo ? ' ' + vo : ''}`
+			name: `${name}${vo ? ' ' + vo : ''}`
 		}
 	} else if (/EPSIO/i.test(typeStr)) {
 		return {
 			sourceType: SourceType.REPLAY,
-			id: 'EPSIO',
+			id: 'EPSIO 1/2',
 			vo: true,
 			raw: typeStr,
 			name: 'EPSIO'

diff --git a/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts b/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts
@@ -1514,7 +1514,7 @@ describe('Body parser', () => {
 				rawType: 'EVS 1',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 1',
+					id: 'EVS 1 1/2',
 					name: 'EVS 1',
 					raw: 'EVS 1',
 					vo: false
@@ -1541,7 +1541,7 @@ describe('Body parser', () => {
 				rawType: 'EVS1VOV',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 1',
+					id: 'EVS 1 1/2',
 					name: 'EVS 1 VOV',
 					raw: 'EVS1VOV',
 					vo: true
@@ -1567,7 +1567,7 @@ describe('Body parser', () => {
 				rawType: 'EVS 1 VO',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 1',
+					id: 'EVS 1 1/2',
 					name: 'EVS 1 VO',
 					raw: 'EVS 1 VO',
 					vo: true
@@ -1585,7 +1585,7 @@ describe('Body parser', () => {
 				rawType: 'EVS 2VO',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 2',
+					id: 'EVS 2 1/2',
 					name: 'EVS 2 VO',
 					raw: 'EVS 2VO',
 					vo: true
@@ -1603,7 +1603,7 @@ describe('Body parser', () => {
 				rawType: 'EVS3VO',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 3',
+					id: 'EVS 3 1/2',
 					name: 'EVS 3 VO',
 					raw: 'EVS3VO',
 					vo: true
@@ -1621,7 +1621,7 @@ describe('Body parser', () => {
 				rawType: 'EVS4 VO',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 4',
+					id: 'EVS 4 1/2',
 					name: 'EVS 4 VO',
 					raw: 'EVS4 VO',
 					vo: true
@@ -2564,7 +2564,7 @@ describe('Body parser', () => {
 							routing: {
 								type: CueType.Routing,
 								target: 'WALL',
-								INP1: { sourceType: SourceType.REPLAY, name: 'EVS 1', id: 'EVS 1', raw: 'EVS 1', vo: false },
+								INP1: { sourceType: SourceType.REPLAY, name: 'EVS 1', id: 'EVS 1 1/2', raw: 'EVS 1', vo: false },
 								iNewsCommand: ''
 							},
 							graphic: {
@@ -2603,7 +2603,7 @@ describe('Body parser', () => {
 				rawType: 'EVS 1',
 				sourceDefinition: {
 					sourceType: SourceType.REPLAY,
-					id: 'EVS 1',
+					id: 'EVS 1 1/2',
 					name: 'EVS 1',
 					raw: 'EVS 1',
 					vo: false

diff --git a/src/tv2_afvd_showstyle/__tests__/configs.ts b/src/tv2_afvd_showstyle/__tests__/configs.ts
@@ -138,9 +138,9 @@ export const defaultStudioConfig: StudioConfig = {
 	),
 	SourcesReplay: prepareConfig(
 		[
-			{ id: 'EVS 1', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_1_audio_1_2'] },
-			{ id: 'EVS 2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_2_audio_1_2'] },
-			{ id: 'EPSIO', switcherSource: 5, sisyfosLayers: ['sisyfos_source_epsio_audio_1_2'] }
+			{ id: 'EVS 1 1/2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_1_audio_1_2'] },
+			{ id: 'EVS 2 1/2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_2_audio_1_2'] },
+			{ id: 'EPSIO 1/2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_epsio_audio_1_2'] }
 		],
 		'SourcesDelayedPlayback',
 		false