feat: integrate new stream selector with the ffmpeg pipeline

server/src/ffmpeg/FFmpegModule.ts

@@ -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,
@@ -18,7 +19,8 @@ const FFmpegModule = new ContainerModule(({ bind }) => {
     FfmpegStreamFactory,
   );
 
-  bind(FfmpegInfo).toSelf();
+  bind(FfmpegInfo).toSelf().inSingletonScope();
+  bind(StreamSelector).toSelf().inSingletonScope();
 });
 
 export { FFmpegModule };

server/src/ffmpeg/FfmpegStreamFactory.ts

@@ -30,7 +30,6 @@ import { isUndefined } from 'lodash-es';
 import type { DeepReadonly } from 'ts-essentials';
 import { match, P } from 'ts-pattern';
 import type { ContentBackedStreamLineupItem } from '../db/derived_types/StreamLineup.ts';
-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';
@@ -42,7 +41,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,
@@ -110,7 +108,6 @@ export class FfmpegStreamFactory {
     @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,
@@ -624,21 +621,21 @@ export class FfmpegStreamFactory {
     let subtitleSource: Nullable<SubtitlesInputSource> = null;
     let subtitleRendition: SubtitleRenditionInfo | undefined;
 
+    // In passthrough mode, only sidecar (Convert) is available since we're
+    // not re-encoding video for burn-in. Need audioDetails because
+    // selectAudioAndSubtitleStreams requires them.
     if (
-      isDefined(streamDetails.subtitleDetails) &&
-      this.channel.subtitlesEnabled
+      isDefined(streamDetails.audioDetails) &&
+      isDefined(streamDetails.subtitleDetails)
     ) {
-      const subtitlePreferences =
-        await this.channelDB.getChannelSubtitlePreferences(this.channel.uuid);
-
-      const pickedSubtitleStream = await SubtitleStreamPicker.pickSubtitles(
-        subtitlePreferences,
-        lineupItem,
-        streamDetails.subtitleDetails,
-        // In passthrough mode, always prefer text-based subs for sidecar
-        // since burn-in is not available.
-        { preferTextBased: true },
-      );
+      const { subtitleStream: pickedSubtitleStream } =
+        await this.streamSelector.selectAudioAndSubtitleStreams({
+          channel: this.channel,
+          lineupItem,
+          audioStreams: streamDetails.audioDetails,
+          subtitleStreams: streamDetails.subtitleDetails,
+          hints: { preferTextBased: true },
+        });
 
       if (pickedSubtitleStream) {
         this.logger.trace('Using subtitle stream: %O', pickedSubtitleStream);