michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7968 from jellyfin/fix-hwa-bluray

Browse Source
This commit is contained in:
Bond-009 2022-06-23 15:32:35 +02:00 committed by GitHub
commit 5f15339919
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -4317,14 +4317,18 @@ namespace MediaBrowser.Controller.MediaEncoding
protected string GetHardwareVideoDecoder(EncodingJobInfo state, EncodingOptions options)
{
var videoStream = state.VideoStream;
if (videoStream == null)
var mediaSource = state.MediaSource;
if (videoStream == null || mediaSource == null)
{
return null;
}
// Only use alternative encoders for video files.
var videoType = state.MediaSource.VideoType ?? VideoType.VideoFile;
if (videoType != VideoType.VideoFile)
// HWA decoders can handle both video files and video folders.
var videoType = mediaSource.VideoType;
if (videoType != VideoType.VideoFile
&& videoType != VideoType.Iso
&& videoType != VideoType.Dvd
&& videoType != VideoType.BluRay)
{
return null;
}