Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions apps/web/src/components/player-defaults.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import {
useMediaState,
useVideoQualityOptions,
} from "../lib/vidstack";
import { includesOriginal, normalizeLanguageTag } from "./player-language";
import {
hasMultipleLanguageTracks,
includesOriginal,
normalizeLanguageTag,
} from "./player-language";

const QUALITY_OPTIONS = { sort: "descending" } as const;

Expand Down Expand Up @@ -114,11 +118,14 @@ export function PlayerDefaults({
: (audioOptions.find((option) => option.track.id === preferredDefaultAudioTrackId) ??
audioOptions.find((option) => option.track.id === originalAudioTrackId));

const hasMultipleLanguages = hasMultipleLanguageTracks(audioOptions);

const missingOriginalByContract = forceOriginal && originalAudioTrackId === null;
const missingOriginalByHeuristic =
forceOriginal && originalAudioTrackId === undefined && !match;
forceOriginal && originalAudioTrackId === undefined && hasMultipleLanguages && !match;
if (
(missingOriginalByContract || missingOriginalByHeuristic) &&
hasMultipleLanguages &&
!originalMissingNotified.current
) {
originalMissingNotified.current = true;
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/components/player-language.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,15 @@ export function includesOriginal(value: string | undefined): boolean {
if (!value) return false;
return value.toLowerCase().includes("original");
}

export function hasMultipleLanguageTracks(
options: readonly { track: { language?: string | null } }[],
): boolean {
const languages = new Set<string>();
for (const option of options) {
const language = normalizeLanguageTag(option.track.language);
if (language) languages.add(language);
if (languages.size > 1) return true;
}
return false;
}
21 changes: 21 additions & 0 deletions apps/web/tests/player-language.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { expect, test } from "bun:test";
import { hasMultipleLanguageTracks } from "../src/components/player-language";

test("distinguishes multiple bitrate tracks from multiple languages", () => {
expect(
hasMultipleLanguageTracks([{ track: { language: "fr-FR" } }, { track: { language: "fr-CA" } }]),
).toBe(false);
expect(
hasMultipleLanguageTracks([{ track: { language: "fr-FR" } }, { track: { language: "en-US" } }]),
).toBe(true);
});

test("ignores missing language tags", () => {
expect(
hasMultipleLanguageTracks([
{ track: { language: "fr-FR" } },
{ track: { language: null } },
{ track: {} },
]),
).toBe(false);
});