Skip to content

Commit 57ddfde

Browse files
jstarpljstarpl
authored
Merge pull request Sofie-Automation#1340 from bbc/upstream/interlaced-fix
fix: prefer field_order from package info stream over deepscan
2 parents fcd04da + 6b36d5b commit 57ddfde

File tree

3 files changed

+126
-30
lines changed

3 files changed

+126
-30
lines changed

‎meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts‎

Lines changed: 110 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,119 @@ import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/cor
4141
const mockMediaObjectsCollection = MongoMock.getInnerMockCollection<MediaObject>(MediaObjects)
4242

4343
describe('lib/mediaObjects', () => {
44-
test('buildFormatString', () => {
45-
const format1 = buildFormatString(
46-
PackageInfo.FieldOrder.TFF,
47-
literal<PieceContentStreamInfo>({
48-
width: 1920,
49-
height: 1080,
50-
codec_time_base: '1/25',
51-
})
52-
)
53-
expect(format1).toEqual('1920x1080i2500tff')
44+
describe('buildFormatString', () => {
45+
it('deepscan tff, stream unknown', () => {
46+
const format1 = buildFormatString(
47+
PackageInfo.FieldOrder.TFF,
48+
literal<PieceContentStreamInfo>({
49+
width: 1920,
50+
height: 1080,
51+
codec_time_base: '1/25',
52+
})
53+
)
54+
expect(format1).toEqual('1920x1080i2500tff')
55+
})
5456

55-
const format2 = buildFormatString(
56-
PackageInfo.FieldOrder.Progressive,
57+
it('deepscan progressive, stream unknown', () => {
58+
const format2 = buildFormatString(
59+
PackageInfo.FieldOrder.Progressive,
60+
literal<PieceContentStreamInfo>({
61+
width: 1280,
62+
height: 720,
63+
codec_time_base: '1001/60000',
64+
})
65+
)
66+
expect(format2).toEqual('1280x720p5994')
67+
})
5768

58-
literal<PieceContentStreamInfo>({
59-
width: 1280,
60-
height: 720,
61-
codec_time_base: '1001/60000',
62-
})
63-
)
64-
expect(format2).toEqual('1280x720p5994')
69+
it('deepscan bff, stream unknown', () => {
70+
const format3 = buildFormatString(
71+
PackageInfo.FieldOrder.BFF,
72+
literal<PieceContentStreamInfo>({
73+
width: 720,
74+
height: 576,
75+
codec_time_base: '1/25',
76+
})
77+
)
78+
expect(format3).toEqual('720x576i2500bff')
79+
})
6580

66-
const format3 = buildFormatString(
67-
PackageInfo.FieldOrder.BFF,
68-
literal<PieceContentStreamInfo>({
69-
width: 720,
70-
height: 576,
71-
codec_time_base: '1/25',
72-
})
73-
)
74-
expect(format3).toEqual('720x576i2500bff')
81+
it('deepscan tff, stream bff', () => {
82+
const format3 = buildFormatString(
83+
PackageInfo.FieldOrder.TFF,
84+
literal<PieceContentStreamInfo>({
85+
width: 720,
86+
height: 576,
87+
codec_time_base: '1/25',
88+
field_order: PackageInfo.FieldOrder.BFF,
89+
})
90+
)
91+
expect(format3).toEqual('720x576i2500bff')
92+
})
93+
94+
it('deepscan bff, stream tff', () => {
95+
const format3 = buildFormatString(
96+
PackageInfo.FieldOrder.BFF,
97+
literal<PieceContentStreamInfo>({
98+
width: 720,
99+
height: 576,
100+
codec_time_base: '1/25',
101+
field_order: PackageInfo.FieldOrder.TFF,
102+
})
103+
)
104+
expect(format3).toEqual('720x576i2500tff')
105+
})
106+
107+
it('deepscan progressive, stream tff', () => {
108+
const format3 = buildFormatString(
109+
PackageInfo.FieldOrder.Progressive,
110+
literal<PieceContentStreamInfo>({
111+
width: 720,
112+
height: 576,
113+
codec_time_base: '1/25',
114+
field_order: PackageInfo.FieldOrder.TFF,
115+
})
116+
)
117+
expect(format3).toEqual('720x576i2500tff')
118+
})
119+
120+
it('deepscan bff, stream progressive', () => {
121+
const format3 = buildFormatString(
122+
PackageInfo.FieldOrder.BFF,
123+
literal<PieceContentStreamInfo>({
124+
width: 720,
125+
height: 576,
126+
codec_time_base: '1/25',
127+
field_order: PackageInfo.FieldOrder.Progressive,
128+
})
129+
)
130+
expect(format3).toEqual('720x576i2500bff')
131+
})
132+
133+
it('deepscan unknown, stream progressive', () => {
134+
const format3 = buildFormatString(
135+
undefined,
136+
literal<PieceContentStreamInfo>({
137+
width: 720,
138+
height: 576,
139+
codec_time_base: '1/25',
140+
field_order: PackageInfo.FieldOrder.Progressive,
141+
})
142+
)
143+
expect(format3).toEqual('720x576p2500')
144+
})
145+
146+
it('r_frame_rate', () => {
147+
const format3 = buildFormatString(
148+
PackageInfo.FieldOrder.Progressive,
149+
literal<PieceContentStreamInfo>({
150+
width: 720,
151+
height: 576,
152+
r_frame_rate: '25/1',
153+
})
154+
)
155+
expect(format3).toEqual('720x576p2500')
156+
})
75157
})
76158

77159
test('acceptFormat', () => {

‎meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,21 @@ interface ScanInfoForPackage {
6060
* formatted string
6161
*/
6262
export function buildFormatString(
63-
field_order: PackageInfo.FieldOrder | undefined,
63+
scan_field_order: PackageInfo.FieldOrder | undefined,
6464
stream: PieceContentStreamInfo
6565
): string {
66+
let field_order: PackageInfo.FieldOrder
67+
if (stream.field_order === PackageInfo.FieldOrder.BFF || stream.field_order === PackageInfo.FieldOrder.TFF) {
68+
// If the stream says it is interlaced, trust that
69+
field_order = stream.field_order
70+
} else if (scan_field_order && scan_field_order !== PackageInfo.FieldOrder.Unknown) {
71+
// Then try the scan if it gave a value
72+
field_order = scan_field_order
73+
} else {
74+
// Fallback to whatever the stream has
75+
field_order = stream.field_order || PackageInfo.FieldOrder.Unknown
76+
}
77+
6678
let format = `${stream.width || 0}x${stream.height || 0}`
6779
switch (field_order) {
6880
case PackageInfo.FieldOrder.Progressive:
@@ -337,6 +349,7 @@ async function checkPieceContentMediaObjectStatus(
337349
codec_time_base: stream.codec.time_base,
338350
channels: stream.channels,
339351
r_frame_rate: undefined,
352+
field_order: undefined,
340353
})
341354
),
342355
(stream) => buildFormatString(mediainfo.field_order, stream),
@@ -877,7 +890,7 @@ function getPackageWarningMessage(
877890

878891
export type PieceContentStreamInfo = Pick<
879892
PackageInfo.FFProbeScanStream,
880-
'width' | 'height' | 'time_base' | 'codec_type' | 'codec_time_base' | 'channels' | 'r_frame_rate'
893+
'width' | 'height' | 'time_base' | 'codec_type' | 'codec_time_base' | 'channels' | 'r_frame_rate' | 'field_order'
881894
>
882895
function checkStreamFormatsAndCounts(
883896
messages: Array<ContentMessage>,

‎packages/shared-lib/src/package-manager/packageInfo.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export namespace PackageInfo {
5151
display_aspect_ratio?: string // Example: '16:9'
5252
pix_fmt?: string // Example: 'yuv420p'
5353
bits_per_raw_sample?: string // Example: '8'
54+
field_order?: FieldOrder
5455

5556
// audio
5657
sample_fmt?: string

0 commit comments

Comments
 (0)