Skip to content

feat: add stream selection UI; first pass #1876

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

Open
chrisbenincasa wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

feat: add stream selection UI; first pass #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4662df2
feat: integrate new stream selector with the ffmpeg pipeline
chrisbenincasa May 15, 2026
efc020d
feat: add stream selection UI; first pass
chrisbenincasa May 15, 2026
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
2 changes: 2 additions & 0 deletions server/src/ffmpeg/FFmpegModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ContainerModule } from 'inversify';
import type { ChannelOrm } from '../db/schema/Channel.ts';
import { bindAssistedFactory } from '../util/assistedInject.ts';
import { FfmpegInfo } from './ffmpegInfo.ts';
import { StreamSelector } from './StreamSelector.ts';

export type FFmpegAssistedFactory = (
transcodeConfig: TranscodeConfigOrm,
Expand All @@ -19,6 +20,7 @@ const FFmpegModule = new ContainerModule(({ bind }) => {
);

bind(FfmpegInfo).toSelf().inSingletonScope();
bind(StreamSelector).toSelf().inSingletonScope();
});

export { FFmpegModule };
38 changes: 11 additions & 27 deletions server/src/ffmpeg/FfmpegStreamFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { injectable } from 'inversify';
import { isUndefined } from 'lodash-es';
import type { DeepReadonly } from 'ts-essentials';
import { match, P } from 'ts-pattern';
import type { IChannelDB } from '../db/interfaces/IChannelDB.ts';
import { FeatureFlagService } from '../services/FeatureFlagService.ts';
import { isImageBasedSubtitle } from '../stream/util.ts';
import { KEYS } from '../types/inject.ts';
Expand All @@ -34,7 +33,6 @@ import { FfmpegPlaybackParamsCalculator } from './FfmpegPlaybackParamsCalculator
import { FfmpegProcess } from './FfmpegProcess.ts';
import { FfmpegTranscodeSession } from './FfmpegTrancodeSession.ts';
import { StreamSelector } from './StreamSelector.ts';
import { SubtitleStreamPicker } from './SubtitleStreamPicker.ts';
import {
AudioStream,
EmbeddedSubtitleStream,
Expand Down Expand Up @@ -101,7 +99,6 @@ export class FfmpegStreamFactory extends IFFMPEG {
@injected(KEYS.SettingsDB) private settingsDB: ISettingsDB,
@injected(KEYS.PipelineBuilderFactory)
private pipelineBuilderFactory: PipelineBuilderFactory,
@injected(KEYS.ChannelDB) private channelDB: IChannelDB,
@injected(FeatureFlagService)
private featureFlagService: FeatureFlagService,
@injected(StreamSelector) private streamSelector: StreamSelector,
Expand Down Expand Up @@ -452,6 +449,7 @@ export class FfmpegStreamFactory extends IFFMPEG {
lineupItem,
audioStreams: streamDetails.audioDetails,
subtitleStreams: streamDetails.subtitleDetails ?? [],
hints: { preferTextBased: true },
});

audioInput = new AudioInputSource(
Expand Down Expand Up @@ -532,24 +530,21 @@ export class FfmpegStreamFactory extends IFFMPEG {
// sidecar (Convert) is available since we're not re-encoding video for
// burn-in.
if (
isDefined(streamDetails.subtitleDetails) &&
this.channel.subtitlesEnabled
isDefined(streamDetails.audioDetails) &&
isDefined(streamDetails.subtitleDetails)
) {
const sidecarEnabled = this.featureFlagService.get(
'webvttSidecarEnabled',
);

const subtitlePreferences =
await this.channelDB.getChannelSubtitlePreferences(this.channel.uuid);

const pickedSubtitleStream = await SubtitleStreamPicker.pickSubtitles(
subtitlePreferences,
lineupItem,
streamDetails.subtitleDetails,
// In copy-all mode, always prefer text-based subs for sidecar
// since burn-in is not available.
{ preferTextBased: isPassthrough || sidecarEnabled },
);
const { subtitleStream: pickedSubtitleStream } =
await this.streamSelector.selectAudioAndSubtitleStreams({
channel: this.channel,
lineupItem,
audioStreams: streamDetails.audioDetails,
subtitleStreams: streamDetails.subtitleDetails,
hints: sidecarEnabled ? { preferTextBased: true } : undefined,
});

if (pickedSubtitleStream) {
this.logger.trace('Using subtitle stream: %O', pickedSubtitleStream);
Expand Down Expand Up @@ -653,17 +648,6 @@ export class FfmpegStreamFactory extends IFFMPEG {
});
}
}
} else if (!this.channel.subtitlesEnabled) {
this.logger.trace(
'Channel %s (number = %d) does not have subtitles enabled. Skipping subtitles.',
this.channel.uuid,
this.channel.number,
);
} else if (!streamDetails.subtitleDetails) {
this.logger.debug(
'Program %s has no subtitle streams to choose from.',
lineupItem.program.uuid,
);
}

const effectiveHwAccel = isPassthrough
Expand Down
Loading