Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6976 from Bond-009/float

Browse Source
This commit is contained in:
Claus Vium 2021-12-12 07:49:23 +01:00 committed by GitHub
commit 2c6d6dbbf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -45,7 +45,7 @@ namespace MediaBrowser.MediaEncoding.Probing
{ {
"AC/DC", "AC/DC",
"Au/Ra", "Au/Ra",
"Bremer/McCoy", "Bremer/McCoy",
"이달의 소녀 1/3", "이달의 소녀 1/3",
"LOONA 1/3", "LOONA 1/3",
"LOONA / yyxy", "LOONA / yyxy",
@ -723,8 +723,8 @@ namespace MediaBrowser.MediaEncoding.Probing
// Some interlaced H.264 files in mp4 containers using MBAFF coding aren't flagged as being interlaced by FFprobe, // Some interlaced H.264 files in mp4 containers using MBAFF coding aren't flagged as being interlaced by FFprobe,
// so for H.264 files we also calculate the frame rate from the codec time base and check if it is double the reported // so for H.264 files we also calculate the frame rate from the codec time base and check if it is double the reported
// frame rate (both rounded to the nearest integer) to determine if the file is interlaced // frame rate (both rounded to the nearest integer) to determine if the file is interlaced
float roundedTimeBaseFPS = MathF.Round(1 / GetFrameRate(stream.CodecTimeBase) ?? 0); int roundedTimeBaseFPS = Convert.ToInt32(1 / GetFrameRate(stream.CodecTimeBase) ?? 0);
float roundedDoubleFrameRate = MathF.Round(stream.AverageFrameRate * 2 ?? 0); int roundedDoubleFrameRate = Convert.ToInt32(stream.AverageFrameRate * 2 ?? 0);
bool videoInterlaced = !string.IsNullOrWhiteSpace(streamInfo.FieldOrder) bool videoInterlaced = !string.IsNullOrWhiteSpace(streamInfo.FieldOrder)
&& !string.Equals(streamInfo.FieldOrder, "progressive", StringComparison.OrdinalIgnoreCase); && !string.Equals(streamInfo.FieldOrder, "progressive", StringComparison.OrdinalIgnoreCase);