Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SOF-1824 Add 1/2 audio track to ingested EVS #235

Merged
merged 2 commits into from
Mar 19, 2024
Merged

SOF-1824 Add 1/2 audio track to ingested EVS #235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21e57b8
SOF-1824 Add 1/2 audio track to ingested EVS
LindvedKrvang Mar 13, 2024
ededde5
SOF-1824 Don't include the audioTrack in the name of EVS when ingesti…
LindvedKrvang Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tv2-common/inewsConversion/converters/ParseBody.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ 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 id = `EVS ${strippedToken![1].toUpperCase()} 1/2`
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will find the correct configuration, but will give the incorrect piece name. When EVS 1 is written in iNews, the corresponding piece name should be EVS 1 as well. It is only action pieces that should show the audio track suffix.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.
I have updated it so the name does not get the audio track (the 1/2).

const vo = strippedToken![2]
return {
sourceType: SourceType.REPLAY,
Expand All @@ -687,7 +687,7 @@ export function getSourceDefinition(typeStr: string): SourceDefinition | undefin
} else if (/EPSIO/i.test(typeStr)) {
return {
sourceType: SourceType.REPLAY,
id: 'EPSIO',
id: 'EPSIO 1/2',
vo: true,
raw: typeStr,
name: 'EPSIO'
Expand Down
30 changes: 15 additions & 15 deletions src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,8 +1514,8 @@ describe('Body parser', () => {
rawType: 'EVS 1',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 1',
name: 'EVS 1',
id: 'EVS 1 1/2',
name: 'EVS 1 1/2',
raw: 'EVS 1',
vo: false
},
Expand All @@ -1541,8 +1541,8 @@ describe('Body parser', () => {
rawType: 'EVS1VOV',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 1',
name: 'EVS 1 VOV',
id: 'EVS 1 1/2',
name: 'EVS 1 1/2 VOV',
raw: 'EVS1VOV',
vo: true
},
Expand All @@ -1567,8 +1567,8 @@ describe('Body parser', () => {
rawType: 'EVS 1 VO',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 1',
name: 'EVS 1 VO',
id: 'EVS 1 1/2',
name: 'EVS 1 1/2 VO',
raw: 'EVS 1 VO',
vo: true
},
Expand All @@ -1585,8 +1585,8 @@ describe('Body parser', () => {
rawType: 'EVS 2VO',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 2',
name: 'EVS 2 VO',
id: 'EVS 2 1/2',
name: 'EVS 2 1/2 VO',
raw: 'EVS 2VO',
vo: true
},
Expand All @@ -1603,8 +1603,8 @@ describe('Body parser', () => {
rawType: 'EVS3VO',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 3',
name: 'EVS 3 VO',
id: 'EVS 3 1/2',
name: 'EVS 3 1/2 VO',
raw: 'EVS3VO',
vo: true
},
Expand All @@ -1621,8 +1621,8 @@ describe('Body parser', () => {
rawType: 'EVS4 VO',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 4',
name: 'EVS 4 VO',
id: 'EVS 4 1/2',
name: 'EVS 4 1/2 VO',
raw: 'EVS4 VO',
vo: true
},
Expand Down Expand Up @@ -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 1/2', id: 'EVS 1 1/2', raw: 'EVS 1', vo: false },
iNewsCommand: ''
},
graphic: {
Expand Down Expand Up @@ -2603,8 +2603,8 @@ describe('Body parser', () => {
rawType: 'EVS 1',
sourceDefinition: {
sourceType: SourceType.REPLAY,
id: 'EVS 1',
name: 'EVS 1',
id: 'EVS 1 1/2',
name: 'EVS 1 1/2',
raw: 'EVS 1',
vo: false
},
Expand Down
6 changes: 3 additions & 3 deletions src/tv2_afvd_showstyle/__tests__/configs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading