timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

add support for embedded text subtitles (#742)

Browse Source 
* first pass at text subtitle support

* support text subtitles from movies, music videos and other videos

* fixes

* qsv fixes

* vaapi fixes

* update changelog
This commit is contained in:
Jason Dove
2022-04-19 12:57:24 -05:00
committed by GitHub
parent 60965d0961
commit e250e93a8e
68 changed files with 22005 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs
+31 -12
View File
@@ -40,6 +40,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
MediaVersion audioVersion,
string videoPath,
string audioPath,
List<Subtitle> subtitles,
DateTimeOffset start,
DateTimeOffset finish,
DateTimeOffset now,
@@ -130,22 +131,37 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
return new AudioInputFile(audioPath, new List<AudioStream> { ffmpegAudioStream }, audioState);
});
Option<SubtitleInputFile> subtitleInputFile = maybeSubtitleStream.Map(
Option<SubtitleInputFile> subtitleInputFile = maybeSubtitleStream.Map<Option<SubtitleInputFile>>(
subtitleStream =>
{
var ffmpegSubtitleStream = new ErsatzTV.FFmpeg.MediaStream(
subtitleStream.Index,
subtitleStream.Codec,
StreamKind.Video);
foreach (Subtitle subtitle in Optional(subtitles.Find(s => s.StreamIndex == subtitleStream.Index)))
{
if (!subtitle.IsImage && !subtitle.IsExtracted)
{
_logger.LogWarning("Subtitles are not yet available for this item");
return None;
}
var ffmpegSubtitleStream = new ErsatzTV.FFmpeg.MediaStream(
subtitle.IsImage ? subtitleStream.Index : 0,
subtitleStream.Codec,
StreamKind.Video);
string path = subtitle.IsImage
? videoPath
: Path.Combine(FileSystemLayout.SubtitleCacheFolder, subtitle.Path);
return new SubtitleInputFile(
path,
new List<ErsatzTV.FFmpeg.MediaStream> { ffmpegSubtitleStream },
false);
}
return None;
return new SubtitleInputFile(
videoPath,
new List<ErsatzTV.FFmpeg.MediaStream> { ffmpegSubtitleStream },
false);
// TODO: figure out HLS direct
// channel.StreamingMode == StreamingMode.HttpLiveStreamingDirect);
});
}).Flatten();
Option<WatermarkInputFile> watermarkInputFile = GetWatermarkInputFile(watermarkOptions, maybeFadePoints);
@@ -214,13 +230,14 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
ptsOffset);
_logger.LogDebug("FFmpeg desired state {FrameState}", desiredState);
var pipelineBuilder = new PipelineBuilder(
videoInputFile,
audioInputFile,
watermarkInputFile,
subtitleInputFile,
FileSystemLayout.FFmpegReportsFolder,
FileSystemLayout.FontsCacheFolder,
_logger);
FFmpegPipeline pipeline = pipelineBuilder.Build(ffmpegState, desiredState);
@@ -312,6 +329,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
None,
None,
FileSystemLayout.FFmpegReportsFolder,
FileSystemLayout.FontsCacheFolder,
_logger);
FFmpegPipeline pipeline = pipelineBuilder.Concat(
@@ -336,6 +354,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
None,
None,
FileSystemLayout.FFmpegReportsFolder,
FileSystemLayout.FontsCacheFolder,
_logger);
FFmpegPipeline pipeline = pipelineBuilder.Resize(outputFile, new FrameSize(-1, height));