bybrooklyn/tunarr
1
0
Fork 0
mirror of https://github.com/chrisbenincasa/tunarr.git synced 2026-04-18 09:03:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(streaming): multiple fixes for image-based sub overlays on CUDA (#1275)

Browse Source 
Fixes #1272
This commit is contained in:
Christian Benincasa
2025-07-22 13:01:56 -04:00
committed by GitHub
parent 555d8384a7
commit bb63c4640e
5 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
server/src/api/debug/debugFfmpegApi.ts
View File

@@ -5,10 +5,15 @@ import type { RouterPluginAsyncCallback } from '@/types/serverType.js';
import dayjs from 'dayjs';
import { z } from 'zod/v4';
import { container } from '../../container.ts';
import type { ContentBackedStreamLineupItem } from '../../db/derived_types/StreamLineup.ts';
import { isContentBackedLineupIteam } from '../../db/derived_types/StreamLineup.ts';
import type { FFmpegFactory } from '../../ffmpeg/FFmpegModule.ts';
import type { FfmpegEncoder } from '../../ffmpeg/ffmpegInfo.ts';
import { FfmpegInfo } from '../../ffmpeg/ffmpegInfo.ts';
import { ExternalStreamDetailsFetcherFactory } from '../../stream/StreamDetailsFetcher.ts';
import type { ProgramStreamResult } from '../../stream/types.ts';
import { KEYS } from '../../types/inject.ts';
import type { Nullable } from '../../types/util.ts';
export const debugFfmpegApiRouter: RouterPluginAsyncCallback = async (
fastify,
@@ -58,7 +63,7 @@ export const debugFfmpegApiRouter: RouterPluginAsyncCallback = async (
tags: ['Debug'],
querystring: z.object({
channel: z.coerce.number().or(z.string()),
path: z.string(),
path: z.string().optional(),
}),
},
},
@@ -74,9 +79,59 @@ export const debugFfmpegApiRouter: RouterPluginAsyncCallback = async (
const transcodeConfig =
await req.serverCtx.transcodeConfigDB.getChannelConfig(channel.uuid);
const streamDetails = await container
.get<LocalFileStreamDetails>(LocalFileStreamDetails)
.getStream({ path: req.query.path });
let streamDetails: Nullable<ProgramStreamResult>;
let lineupItem: ContentBackedStreamLineupItem;
if (req.query.path) {
streamDetails = await container
.get<LocalFileStreamDetails>(LocalFileStreamDetails)
.getStream({ path: req.query.path });
lineupItem = {
duration: +dayjs.duration({ seconds: 30 }),
externalKey: 'none',
externalSource: 'emby',
externalSourceId: 'none',
programBeginMs: 0,
programId: '',
programType: 'movie',
type: 'program',
title: req.query.path,
};
} else {
const lineupItemResult =
await req.serverCtx.streamProgramCalculator.getCurrentLineupItem({
allowSkip: false,
channelId: channel.uuid,
startTime: +dayjs(),
});
if (lineupItemResult.isFailure()) {
return res.status(500).send();
}
const item = lineupItemResult.get().lineupItem;
if (!isContentBackedLineupIteam(item)) {
return res.status(500).send();
}
const server = await req.serverCtx.mediaSourceDB.getByName(
item.externalSourceId,
);
if (!server) {
return res
.status(500)
.send('No server id = ' + item.externalSourceId);
}
lineupItem = item;
streamDetails = await container
.get<ExternalStreamDetailsFetcherFactory>(
ExternalStreamDetailsFetcherFactory,
)
.getStream({
lineupItem: item,
server,
});
}
if (!streamDetails) {
return res.status(500).send();
@@ -92,17 +147,7 @@ export const debugFfmpegApiRouter: RouterPluginAsyncCallback = async (
details: streamDetails.streamDetails,
source: streamDetails.streamSource,
},
lineupItem: {
duration: +dayjs.duration({ seconds: 30 }),
externalKey: 'none',
externalSource: 'emby',
externalSourceId: 'none',
programBeginMs: 0,
programId: '',
programType: 'movie',
type: 'program',
title: req.query.path,
},
lineupItem,
options: {
duration: dayjs.duration({ seconds: 30 }),
outputFormat: MpegTsOutputFormat,