From 60830654f72feb7198e87880047ec34d1574b6fb Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 <kristian.knarvik@knett.no> Date: Sat, 3 May 2025 19:25:07 +0200 Subject: [PATCH] Adds converter for stripping embedded captions from hevc --- .../ffmpegconverter/FFMpegConvert.java | 5 +- .../converter/EmbeddedCaptionStripper.java | 68 +++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/knarcraft/ffmpegconverter/converter/EmbeddedCaptionStripper.java diff --git a/src/main/java/net/knarcraft/ffmpegconverter/FFMpegConvert.java b/src/main/java/net/knarcraft/ffmpegconverter/FFMpegConvert.java index b0ac594..e91ca31 100644 --- a/src/main/java/net/knarcraft/ffmpegconverter/FFMpegConvert.java +++ b/src/main/java/net/knarcraft/ffmpegconverter/FFMpegConvert.java @@ -7,6 +7,7 @@ import net.knarcraft.ffmpegconverter.converter.AudioExtractor; import net.knarcraft.ffmpegconverter.converter.AudioToVorbisConverter; import net.knarcraft.ffmpegconverter.converter.Converter; import net.knarcraft.ffmpegconverter.converter.DownScaleConverter; +import net.knarcraft.ffmpegconverter.converter.EmbeddedCaptionStripper; import net.knarcraft.ffmpegconverter.converter.LetterboxCropper; import net.knarcraft.ffmpegconverter.converter.MKVToMP4Transcoder; import net.knarcraft.ffmpegconverter.converter.MkvH264Converter; @@ -102,7 +103,8 @@ public class FFMpegConvert { 11. Stream reorder 12. Letterbox cropper 13. Video's Audio to vorbis converter - 14. Audio from video extractor""", 1, 14, Integer.MIN_VALUE); + 14. Audio from video extractor + 15. Embedded caption stripper""", 1, 15, Integer.MIN_VALUE); return switch (choice) { case 1 -> generateWebAnimeConverter(); @@ -120,6 +122,7 @@ public class FFMpegConvert { case 13 -> new AudioToVorbisConverter(FFPROBE_PATH, FFMPEG_PATH); case 14 -> new AudioExtractor(FFPROBE_PATH, FFMPEG_PATH, getChoice("<output audio extension>", "mp3"), getChoice("<stream to extract>", 0, 1000, 0)); + case 15 -> new EmbeddedCaptionStripper(FFPROBE_PATH, FFMPEG_PATH); default -> null; }; } diff --git a/src/main/java/net/knarcraft/ffmpegconverter/converter/EmbeddedCaptionStripper.java b/src/main/java/net/knarcraft/ffmpegconverter/converter/EmbeddedCaptionStripper.java new file mode 100644 index 0000000..399e7c4 --- /dev/null +++ b/src/main/java/net/knarcraft/ffmpegconverter/converter/EmbeddedCaptionStripper.java @@ -0,0 +1,68 @@ +package net.knarcraft.ffmpegconverter.converter; + +import net.knarcraft.ffmpegconverter.container.FFMpegCommand; +import net.knarcraft.ffmpegconverter.container.StreamProbeResult; +import net.knarcraft.ffmpegconverter.converter.module.ConverterModule; +import net.knarcraft.ffmpegconverter.converter.module.DebugModule; +import net.knarcraft.ffmpegconverter.converter.module.ModuleExecutor; +import net.knarcraft.ffmpegconverter.converter.module.mapping.MapAllModule; +import net.knarcraft.ffmpegconverter.converter.module.output.CopyAllModule; +import net.knarcraft.ffmpegconverter.converter.module.output.SetOutputFileModule; +import net.knarcraft.ffmpegconverter.utility.FFMpegHelper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +/** + * A transcoder which removes embedded caption subtitles, like EIA-608 + */ +public class EmbeddedCaptionStripper extends AbstractConverter { + + /** + * Instantiates a new mkv to mp4 transcoder + * + * @param ffprobePath <p>Path/command to ffprobe.</p> + * @param ffmpegPath <p>Path/command to ffmpeg.</p> + */ + public EmbeddedCaptionStripper(String ffprobePath, String ffmpegPath) { + super("mkv"); + this.ffprobePath = ffprobePath; + this.ffmpegPath = ffmpegPath; + } + + @Override + @NotNull + public List<String> getValidFormats() { + return List.of("mkv"); + } + + @Override + @Nullable + public FFMpegCommand generateConversionCommand(@NotNull String executable, @NotNull StreamProbeResult probeResult, + @NotNull String outFile) { + FFMpegCommand command = FFMpegHelper.getFFMpegGeneralFileCommand(executable, probeResult.parsedFiles()); + List<ConverterModule> modules = new ArrayList<>(); + + if (this.debug) { + modules.add(new DebugModule()); + } + + // Copy stream info + modules.add(new CopyAllModule()); + + //Add streams to output file + modules.add(new MapAllModule<>(probeResult.getVideoStreams())); + modules.add(new MapAllModule<>(probeResult.getAudioStreams())); + modules.add(new MapAllModule<>(probeResult.getSubtitleStreams())); + modules.add(new MapAllModule<>(probeResult.getOtherStreams())); + command.addOutputFileOption("-bsf:v", "filter_units=remove_types=39"); + + modules.add(new SetOutputFileModule(outFile)); + + new ModuleExecutor(command, modules).execute(); + return command; + } + +}