lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8335 from eglia/keyframe-extract-fixes

Browse Source
This commit is contained in:
Bond-009 2022-09-09 13:42:02 +02:00 committed by GitHub
commit eb12aaf396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -36,6 +36,7 @@
- [dmitrylyzo](https://github.com/dmitrylyzo) - [dmitrylyzo](https://github.com/dmitrylyzo)
- [DMouse10462](https://github.com/DMouse10462) - [DMouse10462](https://github.com/DMouse10462)
- [DrPandemic](https://github.com/DrPandemic) - [DrPandemic](https://github.com/DrPandemic)
- [eglia](https://github.com/eglia)
- [EraYaN](https://github.com/EraYaN) - [EraYaN](https://github.com/EraYaN)
- [escabe](https://github.com/escabe) - [escabe](https://github.com/escabe)
- [excelite](https://github.com/excelite) - [excelite](https://github.com/excelite)

17
src/Jellyfin.MediaEncoding.Keyframes/FfProbe/FfProbeKeyframeExtractor.cs
View File

@ -11,7 +11,7 @@ namespace Jellyfin.MediaEncoding.Keyframes.FfProbe;
/// </summary> /// </summary>
public static class FfProbeKeyframeExtractor public static class FfProbeKeyframeExtractor
{ {
private const string DefaultArguments = "-v error -skip_frame nokey -show_entries format=duration -show_entries stream=duration -show_entries packet=pts_time,flags -select_streams v -of csv \"{0}\""; private const string DefaultArguments = "-fflags +genpts -v error -skip_frame nokey -show_entries format=duration -show_entries stream=duration -show_entries packet=pts_time,flags -select_streams v -of csv \"{0}\"";
/// <summary> /// <summary>
/// Extracts the keyframes using the ffprobe executable at the specified path. /// Extracts the keyframes using the ffprobe executable at the specified path.
@ -62,12 +62,17 @@ public static class FfProbeKeyframeExtractor
var rest = line[(firstComma + 1)..]; var rest = line[(firstComma + 1)..];
if (lineType.Equals("packet", StringComparison.OrdinalIgnoreCase)) if (lineType.Equals("packet", StringComparison.OrdinalIgnoreCase))
{ {
if (rest.EndsWith(",K_")) // Split time and flags from the packet line. Example line: packet,7169.079000,K_
var secondComma = rest.IndexOf(',');
var ptsTime = rest[..secondComma];
var flags = rest[(secondComma + 1)..];
if (flags.StartsWith("K_"))
{ {
// Trim the flags from the packet line. Example line: packet,7169.079000,K_ if (double.TryParse(ptsTime, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var keyframe))
var keyframe = double.Parse(rest[..^3], NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture); {
// Have to manually convert to ticks to avoid rounding errors as TimeSpan is only precise down to 1 ms when converting double. // Have to manually convert to ticks to avoid rounding errors as TimeSpan is only precise down to 1 ms when converting double.
keyframes.Add(Convert.ToInt64(keyframe * TimeSpan.TicksPerSecond)); keyframes.Add(Convert.ToInt64(keyframe * TimeSpan.TicksPerSecond));
}
} }
} }
else if (lineType.Equals("stream", StringComparison.OrdinalIgnoreCase)) else if (lineType.Equals("stream", StringComparison.OrdinalIgnoreCase))