KnarCraft/FFmpegConvert
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fixes subtitle mapping for video with only external subtitles
All checks were successful
KnarCraft/FFmpegConvert/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Kristian Knarvik
2023-08-12 22:14:46 +02:00
parent 5d94cabca0
commit 56f5e31934
3 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/knarcraft/ffmpegconverter/utility/FFMpegHelper.java
View File

@ -285,7 +285,7 @@ public final class FFMpegHelper {
} else if (stream.contains("codec_type=audio")) {
parsedStreams.add(parseAudioStream(streamParts, relativeAudioIndex++));
} else if (stream.contains("codec_type=subtitle")) {
parsedStreams.add(parseSubtitleStream(streamParts, relativeSubtitleIndex++, file.getName()));
parsedStreams.add(parseSubtitleStream(streamParts, relativeSubtitleIndex++, file.getName(), true));
}
}
List<StreamObject> externalSubtitles = getExternalSubtitles(ffprobePath, file.getParentFile(), file.getName());
@ -323,7 +323,7 @@ public final class FFMpegHelper {
String[] streams = probeForStreams(ffprobePath, subtitleFile);
for (String stream : streams) {
String[] streamParts = stream.split(PROBE_SPLIT_CHARACTER);
parsedStreams.add(parseSubtitleStream(streamParts, 0, subtitleFile.getName()));
parsedStreams.add(parseSubtitleStream(streamParts, 0, subtitleFile.getName(), false));
}
}
return parsedStreams;
@ -405,14 +405,15 @@ public final class FFMpegHelper {
/**
* Parses a list of subtitle stream parameters to a subtitle stream object
*
* @param streamParts <p>A list of parameters belonging to a subtitle stream.</p>
* @param relativeIndex <p>The relative index of the subtitle.</p>
* @param file <p>The file currently being converted.</p>
* @param streamParts <p>A list of parameters belonging to a subtitle stream.</p>
* @param relativeIndex <p>The relative index of the subtitle.</p>
* @param file <p>The file currently being converted.</p>
* @param isInternalStream <p>Whether the subtitle stream is in the main video file</p>
* @return <p>A SubtitleStream object.</p>
* @throws NumberFormatException <p>If codec index contains a non-numeric value.</p>
*/
private static SubtitleStream parseSubtitleStream(String[] streamParts, int relativeIndex, String file)
throws NumberFormatException {
private static SubtitleStream parseSubtitleStream(String[] streamParts, int relativeIndex, String file,
boolean isInternalStream) throws NumberFormatException {
String codecName = null;
int absoluteIndex = -1;
String language = null;
@ -428,7 +429,7 @@ public final class FFMpegHelper {
title = streamPart.replace("TAG:title=", "");
}
}
return new SubtitleStream(codecName, absoluteIndex, relativeIndex, language, title, file);
return new SubtitleStream(codecName, absoluteIndex, relativeIndex, language, title, file, isInternalStream);
}
}