aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordkanada <dkanada@users.noreply.github.com>2020-02-03 15:58:26 +0900
committerGitHub <noreply@github.com>2020-02-03 15:58:26 +0900
commitc1ecd886d97d11a60f8b3ecccf195f6d124c57a6 (patch)
tree709d2bd5ba0c360ea18d49f429174712c2039160
parent021427d8816dcccd739fc0c22be10eae39c7c96d (diff)
parentc149fcb3ee4a393653603419fc988670cb31778c (diff)
Merge pull request #2368 from nyanmisaka/master
Fix framerate info not showing when mediasource is in H264 format.
-rw-r--r--MediaBrowser.Controller/MediaEncoding/JobLogger.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
index 171aedb0e..38fb45810 100644
--- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
+++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
@@ -90,6 +90,15 @@ namespace MediaBrowser.Controller.MediaEncoding
framerate = val;
}
}
+ else if (part.StartsWith("fps=", StringComparison.OrdinalIgnoreCase))
+ {
+ var rate = part.Split(new[] { '=' }, 2)[^1];
+
+ if (float.TryParse(rate, NumberStyles.Any, _usCulture, out var val))
+ {
+ framerate = val;
+ }
+ }
else if (state.RunTimeTicks.HasValue &&
part.StartsWith("time=", StringComparison.OrdinalIgnoreCase))
{