alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-02 00:12:24 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into hdr-extract

Browse Source
This commit is contained in:
Nyanmisaka
2020-12-01 00:59:21 +08:00
committed by GitHub
parent 3e9cf98c30 78fef80696
commit 421faabc7c
13 changed files with 89 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,11 @@ namespace MediaBrowser.MediaEncoding.Probing
}
}
if (bitrate == 0 && formatInfo != null && !string.IsNullOrEmpty(formatInfo.BitRate) && stream.Type == MediaStreamType.Video)
// The bitrate info of FLAC musics and some videos is included in formatInfo.
if (bitrate == 0
&& formatInfo != null
&& !string.IsNullOrEmpty(formatInfo.BitRate)
&& (stream.Type == MediaStreamType.Video || stream.Type == MediaStreamType.Audio))
{
// If the stream info doesn't have a bitrate get the value from the media format info
if (int.TryParse(formatInfo.BitRate, NumberStyles.Any, _usCulture, out var value))