Don't do AR changes on negative aspect ratios
This commit is contained in:
parent
391b0ac7ab
commit
73aa925067
@ -687,7 +687,13 @@ export class Aard {
|
|||||||
// if detected aspect ratio is different from the current aspect ratio
|
// if detected aspect ratio is different from the current aspect ratio
|
||||||
// if (this.testResults.aspectRatioUpdated) {
|
// if (this.testResults.aspectRatioUpdated) {
|
||||||
// this.timer.arChanged();
|
// this.timer.arChanged();
|
||||||
this.updateAspectRatio();
|
const finalAr = this.getAr();
|
||||||
|
if (finalAr > 0) {
|
||||||
|
this.updateAspectRatio(finalAr);
|
||||||
|
} else {
|
||||||
|
this.testResults.aspectRatioInvalid = true;
|
||||||
|
this.testResults.aspectRatioInvalidReason = finalAr.toFixed(3);
|
||||||
|
}
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// if we got "no letterbox" OR aspectRatioUpdated
|
// if we got "no letterbox" OR aspectRatioUpdated
|
||||||
|
@ -370,7 +370,8 @@ export class AardDebugUi {
|
|||||||
out = `${out}
|
out = `${out}
|
||||||
|
|
||||||
-- UNCERTAIN FLAGS
|
-- UNCERTAIN FLAGS
|
||||||
AR: ${testResults.aspectRatioUncertain} (reason: ${testResults.aspectRatioUncertainReason ?? 'n/a'}); top row: ${testResults.topRowUncertain}; bottom row: ${testResults.bottomRowUncertain}
|
AR: ${testResults.aspectRatioUncertain} (reason: ${testResults.aspectRatioUncertainReason ?? 'n/a'}); top row: ${testResults.topRowUncertain}; bottom row: ${testResults.bottomRowUncertain}${
|
||||||
|
testResults.aspectRatioInvalid ? `\nINVALID_AR (reason: ${testResults.aspectRatioInvalidReason ?? 'n/a'})` : ''}
|
||||||
|
|
||||||
-- GUARD & IMAGE LINE
|
-- GUARD & IMAGE LINE
|
||||||
bottom guard: ${testResults.guardLine.bottom} image: ${testResults.guardLine.invalidated ? 'n/a' : testResults.imageLine.bottom}
|
bottom guard: ${testResults.guardLine.bottom} image: ${testResults.guardLine.invalidated ? 'n/a' : testResults.imageLine.bottom}
|
||||||
|
@ -39,7 +39,9 @@ export interface AardTestResults {
|
|||||||
letterboxWidth: number,
|
letterboxWidth: number,
|
||||||
letterboxOffset: number,
|
letterboxOffset: number,
|
||||||
logoDetected: [boolean, boolean, boolean, boolean]
|
logoDetected: [boolean, boolean, boolean, boolean]
|
||||||
|
aspectRatioInvalid: boolean
|
||||||
aspectRatioUncertainReason?: string
|
aspectRatioUncertainReason?: string
|
||||||
|
aspectRatioInvalidReason?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export function initAardTestResults(settings: AardSettings): AardTestResults {
|
export function initAardTestResults(settings: AardSettings): AardTestResults {
|
||||||
@ -81,7 +83,8 @@ export function initAardTestResults(settings: AardSettings): AardTestResults {
|
|||||||
activeAspectRatio: 0,
|
activeAspectRatio: 0,
|
||||||
letterboxWidth: 0,
|
letterboxWidth: 0,
|
||||||
letterboxOffset: 0,
|
letterboxOffset: 0,
|
||||||
logoDetected: [false, false, false, false]
|
logoDetected: [false, false, false, false],
|
||||||
|
aspectRatioInvalid: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,4 +123,5 @@ export function resetAardTestResults(results: AardTestResults): void {
|
|||||||
results.aspectRatioUncertainReason = null;
|
results.aspectRatioUncertainReason = null;
|
||||||
results.topRowUncertain = false;
|
results.topRowUncertain = false;
|
||||||
results.bottomRowUncertain = false;
|
results.bottomRowUncertain = false;
|
||||||
|
results.aspectRatioInvalid = false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user