mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 13:10:45 +02:00
Merge pull request #7968 from jellyfin/fix-hwa-bluray
(cherry picked from commit 5f15339919
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
parent
fe32b5e333
commit
074d7dc6b6
|
@ -4319,14 +4319,18 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
protected string GetHardwareVideoDecoder(EncodingJobInfo state, EncodingOptions options)
|
protected string GetHardwareVideoDecoder(EncodingJobInfo state, EncodingOptions options)
|
||||||
{
|
{
|
||||||
var videoStream = state.VideoStream;
|
var videoStream = state.VideoStream;
|
||||||
if (videoStream == null)
|
var mediaSource = state.MediaSource;
|
||||||
|
if (videoStream == null || mediaSource == null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only use alternative encoders for video files.
|
// HWA decoders can handle both video files and video folders.
|
||||||
var videoType = state.MediaSource.VideoType ?? VideoType.VideoFile;
|
var videoType = mediaSource.VideoType;
|
||||||
if (videoType != VideoType.VideoFile)
|
if (videoType != VideoType.VideoFile
|
||||||
|
&& videoType != VideoType.Iso
|
||||||
|
&& videoType != VideoType.Dvd
|
||||||
|
&& videoType != VideoType.BluRay)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue