Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-09-20 05:22:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duration parsing of .mkv and .webm files

Browse source 
Former-commit-id: a4c7d87e62
This commit is contained in:
Cry dsch 2020-02-12 21:26:27 +01:00
parent 3ed5c7b314
commit 37fc05b26b
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
FFMpegCore/FFMPEG/FFMpegStreamMetadata.cs
View file

@ -31,8 +31,18 @@ internal class Stream
[JsonProperty("r_frame_rate")] [JsonProperty("r_frame_rate")]
internal string FrameRate { get; set; } internal string FrameRate { get; set; }
[JsonProperty("tags")]
internal Tags Tags { get; set; }
} }
internal class Tags
{
[JsonProperty("DURATION")]
internal string Duration { get; set; }
}
internal class FFMpegStreamMetadata internal class FFMpegStreamMetadata
{ {
[JsonProperty("streams")] [JsonProperty("streams")]

17
FFMpegCore/FFMPEG/FFProbe.cs
View file

@ -79,9 +79,20 @@ private VideoInfo ParseVideoInfoInternal(VideoInfo info, string probeOutput)
double videoSize = 0d; double videoSize = 0d;
double audioSize = 0d; double audioSize = 0d;
var duration = TimeSpan.FromSeconds(double.TryParse((video ?? audio).Duration, NumberStyles.Any, CultureInfo.InvariantCulture, out var output) ? output : 0); string sDuration = (video ?? audio).Duration;
info.Duration = duration.Subtract(TimeSpan.FromMilliseconds(duration.Milliseconds)); TimeSpan duration;
if (sDuration != null)
{
duration = TimeSpan.FromSeconds(double.TryParse(sDuration, NumberStyles.Any, CultureInfo.InvariantCulture, out var output) ? output : 0);
}
else
{
sDuration = (video ?? audio).Tags.Duration;
TimeSpan.TryParse(sDuration.Remove(sDuration.LastIndexOf('.')), CultureInfo.InvariantCulture, out duration);
}
// Strip milliseconds and additional ticks
info.Duration = new TimeSpan(duration.Days, duration.Hours, duration.Minutes, duration.Seconds);
if (video != null) if (video != null)
{ {
var bitRate = Convert.ToDouble(video.BitRate, CultureInfo.InvariantCulture); var bitRate = Convert.ToDouble(video.BitRate, CultureInfo.InvariantCulture);