fix: properly apply next state from decoder in qsv pipeline

chrisbenincasa · Jan 12, 2025 · 3a8a8e7 · 3a8a8e7
1 parent adc267e
commit 3a8a8e7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/server/src/ffmpeg/FfmpegStreamFactory.ts b/server/src/ffmpeg/FfmpegStreamFactory.ts
@@ -3,6 +3,7 @@ import { TranscodeConfig } from '@/db/schema/TranscodeConfig.ts';
 import { HttpStreamSource } from '@/stream/types.ts';
 import { Maybe, Nullable } from '@/types/util.ts';
 import { isDefined, isLinux, isNonEmptyString } from '@/util/index.ts';
+import { LoggerFactory } from '@/util/logging/LoggerFactory.ts';
 import { makeLocalUrl } from '@/util/serverUtil.ts';
 import { ChannelStreamModes, FfmpegSettings } from '@tunarr/types';
 import dayjs from 'dayjs';
@@ -48,6 +49,7 @@ import { HlsWrapperOptions, IFFMPEG } from './ffmpegBase.ts';
 import { FfmpegInfo } from './ffmpegInfo.ts';
 
 export class FfmpegStreamFactory extends IFFMPEG {
+  private logger = LoggerFactory.child({ className: FfmpegStreamFactory.name });
   private ffmpegInfo: FfmpegInfo;
   private pipelineBuilderFactory: PipelineBuilderFactory;
 
@@ -325,6 +327,7 @@ export class FfmpegStreamFactory extends IFFMPEG {
       frameRate: videoStreamDetails.framerate?.toString(),
     });
 
+    this.logger.debug('Video stream input: %O', videoStream);
     const videoInput = new VideoInputSource(streamSource, [videoStream]);
 
     const audioState = AudioState.create({

diff --git a/server/src/ffmpeg/builder/pipeline/BasePipelineBuilder.ts b/server/src/ffmpeg/builder/pipeline/BasePipelineBuilder.ts
@@ -127,7 +127,6 @@ export type PipelineBuilderContext = {
   desiredAudioState?: AudioState;
   pipelineSteps: PipelineStep[];
   filterChain: FilterChain;
-  decoder: Nullable<Decoder>;
 
   hasWatermark: boolean;
   hasSubtitleOverlay: boolean;
@@ -281,7 +280,6 @@ export abstract class BasePipelineBuilder implements PipelineBuilder {
       desiredAudioState: this.audioInputSource?.desiredState,
       pipelineSteps: [],
       filterChain: new FilterChain(),
-      decoder: this.decoder,
       hasWatermark: !!this.watermarkInputSource,
       hasSubtitleOverlay: false, // TODO:
       is10BitOutput: (desiredState.pixelFormat?.bitDepth ?? 8) === 10,
@@ -604,7 +602,7 @@ export abstract class BasePipelineBuilder implements PipelineBuilder {
       decoder = DecoderFactory.getSoftwareDecoder(this.context.videoStream);
       this.videoInputSource.addOption(decoder);
     }
-    this.context.decoder = decoder;
+    this.decoder = decoder;
     return decoder;
   }
 

diff --git a/server/src/ffmpeg/builder/pipeline/hardware/NvidiaPipelineBuilder.ts b/server/src/ffmpeg/builder/pipeline/hardware/NvidiaPipelineBuilder.ts
@@ -125,7 +125,7 @@ export class NvidiaPipelineBuilder extends SoftwarePipelineBuilder {
         decoder = super.setupDecoder();
       }
     }
-    this.context.decoder = decoder;
+    this.decoder = decoder;
     return decoder;
   }
 

diff --git a/server/src/ffmpeg/builder/pipeline/hardware/QsvPipelineBuilder.ts b/server/src/ffmpeg/builder/pipeline/hardware/QsvPipelineBuilder.ts
@@ -123,7 +123,6 @@ export class QsvPipelineBuilder extends SoftwarePipelineBuilder {
     const {
       desiredState,
       videoStream,
-      decoder,
       ffmpegState,
       pipelineSteps,
       filterChain,
@@ -135,8 +134,8 @@ export class QsvPipelineBuilder extends SoftwarePipelineBuilder {
       paddedSize: videoStream.frameSize,
     });
 
-    if (decoder) {
-      currentState = decoder.nextState(currentState);
+    if (this.decoder) {
+      currentState = this.decoder.nextState(currentState);
     }
 
     currentState = this.setDeinterlace(currentState);

diff --git a/server/src/ffmpeg/builder/pipeline/hardware/VaapiPipelineBuilder.ts b/server/src/ffmpeg/builder/pipeline/hardware/VaapiPipelineBuilder.ts
@@ -128,7 +128,7 @@ export class VaapiPipelineBuilder extends SoftwarePipelineBuilder {
       })
       .otherwise(() => super.setupDecoder());
 
-    this.context.decoder = decoder;
+    this.decoder = decoder;
 
     return decoder;
   }
@@ -138,7 +138,7 @@ export class VaapiPipelineBuilder extends SoftwarePipelineBuilder {
       return;
     }
 
-    const { desiredState, videoStream, ffmpegState, pipelineSteps, decoder } =
+    const { desiredState, videoStream, ffmpegState, pipelineSteps } =
       this.context;
 
     let currentState = desiredState.update({
@@ -148,7 +148,7 @@ export class VaapiPipelineBuilder extends SoftwarePipelineBuilder {
       pixelFormat: videoStream.pixelFormat,
     });
 
-    currentState = decoder?.nextState(currentState) ?? currentState;
+    currentState = this.decoder?.nextState(currentState) ?? currentState;
 
     currentState = this.setDeinterlace(currentState);
     currentState = this.setScale(currentState);

diff --git a/server/src/stream/hls/HlsSession.ts b/server/src/stream/hls/HlsSession.ts
@@ -143,8 +143,8 @@ export class HlsSession extends BaseHlsSession<HlsSessionOptions> {
 
     const transcodeResult = await lineupItemResult.mapAsync(async (result) => {
       this.logger.debug(
-        'About to play item: %s',
-        JSON.stringify(result, undefined, 4),
+        'About to play lineup item: %s',
+        JSON.stringify(result.lineupItem, undefined, 4),
       );
       const context = new PlayerContext(
         result.lineupItem,