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 1817/merge develop into staging #238

Merged
merged 14 commits into from
Mar 25, 2024
Merged

Sof 1817/merge develop into staging #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b287450
Automerge 'staging' to 'develop'.
Mar 6, 2024
522eb74
feat: Adds content data for graphic template into metadata so we wont…
RasmusAlbrektsen Mar 11, 2024
a6b7fd2
fix: Fixes failings tests
RasmusAlbrektsen Mar 11, 2024
06e1efd
SOF-1823 Set proper default values for casparcg_player_clip_pending l…
LindvedKrvang Mar 12, 2024
3298828
fix: Adds s to graphicTemplate
RasmusAlbrektsen Mar 13, 2024
0b7c07d
Merge pull request #234 from tv2/SOF-1823/lookaheadMissingInStaging
LindvedKrvang Mar 13, 2024
21e57b8
SOF-1824 Add 1/2 audio track to ingested EVS
LindvedKrvang Mar 13, 2024
e9bb98d
SOF-1789 Notify Core about error when CasparCgDesignValues has a whit…
LindvedKrvang Mar 13, 2024
98b8ca1
Merge pull request #236 from tv2/SOF-1789/warnForInvalidSchemaDesignE…
LindvedKrvang Mar 15, 2024
f0e3f43
Merge pull request #233 from tv2/SOF-1636/AddGraphicMetadataForTooltips
RasmusAlbrektsen Mar 15, 2024
ededde5
SOF-1824 Don't include the audioTrack in the name of EVS when ingesti…
LindvedKrvang Mar 19, 2024
5c2495e
Merge pull request #235 from tv2/SOF-1824/evsIsIngestedIncorrectly
LindvedKrvang Mar 19, 2024
549cd82
fix: Removes output layer for selected servers and sets the piece typ…
RasmusAlbrektsen Mar 21, 2024
65a64a7
Merge pull request #237 from tv2/SOF-1830/SetSelectedServcersToUnknow…
RasmusAlbrektsen Mar 22, 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
24 changes: 23 additions & 1 deletion src/tv2-common/cues/gfx-schema-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@ import { CueType, SharedGraphicLLayer, SharedOutputLayer, SharedSourceLayer } fr
import { Tv2PieceType } from '../../tv2-constants/tv2-piece-type'
import { DveLoopGenerator } from '../helpers/graphics/caspar/dve-loop-generator'

interface CasparCgDesignValues {
name: string
properties: unknown
}

const NON_BASELINE_SCHEMA: string = 'NON_BASELINE_SCHEMA'
const VALID_EMPTY_SCHEMA_VALUE: string = 'N/A'

export class GfxSchemaGenerator {
constructor(private dveLoopGenerator: DveLoopGenerator) {}

public createBaselineTimelineObjectsFromGfxDefaults(context: ShowStyleContext): TSR.TSRTimelineObjBase[] {
this.assertAllCasparCgDesignValues(context)

const schemaId: string = context.config.showStyle.GfxDefaults[0].DefaultSchema.value
if (VALID_EMPTY_SCHEMA_VALUE === schemaId) {
return []
Expand All @@ -32,7 +39,6 @@ export class GfxSchemaGenerator {
)
return []
}

const cue: CueDefinitionGfxSchema = {
type: CueType.GraphicSchema,
schema: schema.VizTemplate,
Expand All @@ -42,6 +48,22 @@ export class GfxSchemaGenerator {
return this.createBaselineTimelineObjects(context, cue, 10)
}

private assertAllCasparCgDesignValues(context: ShowStyleContext): void {
context.config.showStyle.GfxSchemaTemplates.forEach((schema) => {
if (!schema.CasparCgDesignValues) {
return
}
const casparCgDesignValues: CasparCgDesignValues[] = JSON.parse(schema.CasparCgDesignValues)
casparCgDesignValues.forEach((designValues) => {
if (designValues.name && designValues.name.includes(' ')) {
context.core.notifyUserError(
`Schema for ${schema.VizTemplate} has invalid CasparCgDesignValues. The Design ${designValues.name} has whitespace in it's name!`
)
}
})
})
}

public createBlueprintPieceFromGfxSchemaCue(
context: ShowStyleContext,
pieces: IBlueprintPiece[],
Expand Down
3 changes: 2 additions & 1 deletion src/tv2-common/helpers/graphics/internal/InternalGraphic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ export abstract class InternalGraphic extends Graphic {
type: Tv2PieceType.GRAPHICS,
outputLayer: Tv2OutputLayer.OVERLAY,
partType: this.partDefinition?.type,
pieceExternalId: this.partDefinition?.externalId
pieceExternalId: this.partDefinition?.externalId,
graphicsTemplateName: this.templateName
}
}
}
Expand Down
11 changes: 6 additions & 5 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,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'
Expand Down
16 changes: 8 additions & 8 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,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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
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', id: 'EVS 1 1/2', raw: 'EVS 1', vo: false },
iNewsCommand: ''
},
graphic: {
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/tv2-common/onTimelineGenerate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export interface PieceMetaData {
export interface GraphicPieceMetaData extends PieceMetaData {
partType?: PartType
pieceExternalId?: string
graphicsTemplateName?: string
}

export interface JinglePieceMetaData extends PieceMetaData {
Expand Down
3 changes: 1 addition & 2 deletions src/tv2-common/parts/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,7 @@ function getServerSelectionBlueprintPiece(
sourceLayerId: layers.SourceLayer.SelectedServer,
lifespan: PieceLifespan.WithinPart,
metaData: {
type: Tv2PieceType.VIDEO_CLIP,
outputLayer: Tv2OutputLayer.PROGRAM,
type: Tv2PieceType.UNKNOWN,
sourceName: contentServerElement.fileName,
audioMode:
layers.SourceLayer.SelectedServer === SharedSourceLayer.SelectedVoiceOver
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
12 changes: 8 additions & 4 deletions src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ describe('grafik piece', () => {
type: Tv2PieceType.GRAPHICS,
outputLayer: Tv2OutputLayer.OVERLAY,
partType: PartType.Kam,
pieceExternalId: dummyPart.externalId
pieceExternalId: dummyPart.externalId,
graphicsTemplateName: 'bund'
},
outputLayerId: SharedOutputLayer.OVERLAY,
sourceLayerId: SourceLayer.PgmGraphicsLower,
Expand Down Expand Up @@ -400,7 +401,8 @@ describe('grafik piece', () => {
type: Tv2PieceType.GRAPHICS,
outputLayer: Tv2OutputLayer.OVERLAY,
partType: PartType.Kam,
pieceExternalId: dummyPart.externalId
pieceExternalId: dummyPart.externalId,
graphicsTemplateName: 'bund'
},
outputLayerId: SharedOutputLayer.OVERLAY,
sourceLayerId: SourceLayer.PgmGraphicsLower,
Expand Down Expand Up @@ -550,7 +552,8 @@ describe('grafik piece', () => {
type: Tv2PieceType.GRAPHICS,
outputLayer: Tv2OutputLayer.OVERLAY,
partType: PartType.Kam,
pieceExternalId: dummyPart.externalId
pieceExternalId: dummyPart.externalId,
graphicsTemplateName: 'direkte'
},
outputLayerId: SharedOutputLayer.OVERLAY,
sourceLayerId: SourceLayer.PgmGraphicsIdent,
Expand Down Expand Up @@ -619,7 +622,8 @@ describe('grafik piece', () => {
type: Tv2PieceType.GRAPHICS,
outputLayer: Tv2OutputLayer.OVERLAY,
partType: PartType.Kam,
pieceExternalId: dummyPart.externalId
pieceExternalId: dummyPart.externalId,
graphicsTemplateName: 'arkiv'
},
outputLayerId: SharedOutputLayer.OVERLAY,
sourceLayerId: SourceLayer.PgmGraphicsIdent,
Expand Down
3 changes: 2 additions & 1 deletion src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ describe('telefon', () => {
type: Tv2PieceType.GRAPHICS,
outputLayer: Tv2OutputLayer.OVERLAY,
partType: PartType.Kam,
pieceExternalId: dummyPart.externalId
pieceExternalId: dummyPart.externalId,
graphicsTemplateName: 'bund'
},
content: literal<WithTimeline<GraphicsContent>>({
fileName: 'bund',
Expand Down
4 changes: 2 additions & 2 deletions src/tv2_afvd_studio/migrations/mappings-defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ export const MAPPINGS_CASPAR: BlueprintMappings = {
device: TSR.DeviceType.ABSTRACT,
deviceId: 'abstract0',
lookahead: LookaheadMode.PRELOAD,
lookaheadDepth: 1,
lookaheadMaxSearchDistance: -1
lookaheadDepth: 2,
lookaheadMaxSearchDistance: 10
}),
[CasparPlayerClip(1)]: literal<TSR.MappingCasparCG & BlueprintMapping>({
device: TSR.DeviceType.CASPARCG,
Expand Down
2 changes: 1 addition & 1 deletion src/tv2_offtube_studio/migrations/mappings-defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ const MAPPINGS_CASPAR: BlueprintMappings = {
deviceId: 'abstract0',
lookahead: LookaheadMode.PRELOAD,
lookaheadDepth: 1,
lookaheadMaxSearchDistance: 1
lookaheadMaxSearchDistance: 5
}),
[CasparPlayerClip(1)]: literal<TSR.MappingCasparCG & BlueprintMapping>({
device: TSR.DeviceType.CASPARCG,
Expand Down
Loading