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

Fix missing commas and merge defects

Browse Source
This commit is contained in:
Vasily 2020-05-26 18:41:38 +03:00
parent 3c82379759
commit 628734931c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,9 +475,6 @@ namespace MediaBrowser.Controller.MediaEncoding
if (state.IsVideoRequest if (state.IsVideoRequest
&& string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase)) && string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
{ {
var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
var hasTextSubs = state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode; var hasTextSubs = state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
if (!hasTextSubs) if (!hasTextSubs)

6
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@ -45,7 +45,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
"mpeg2_mediacodec", "mpeg2_mediacodec",
"mpeg4_mediacodec", "mpeg4_mediacodec",
"vp8_mediacodec", "vp8_mediacodec",
"vp9_mediacodec" "vp9_mediacodec",
"h264_videotoolbox", "h264_videotoolbox",
"hevc_videotoolbox", "hevc_videotoolbox",
"mpeg2_videotoolbox", "mpeg2_videotoolbox",
@ -80,8 +80,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
"hevc_vaapi", "hevc_vaapi",
"h264_omx", "h264_omx",
"hevc_omx", "hevc_omx",
"h264_v4l2m2m" "h264_v4l2m2m",
"h264_videotoolbox" "h264_videotoolbox",
"hevc_videotoolbox" "hevc_videotoolbox"
}; };

2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -258,7 +258,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
//_logger.Info("Supported decoders: {0}", string.Join(",", list.ToArray())); //_logger.Info("Supported decoders: {0}", string.Join(",", list.ToArray()));
} }
private List<string> _hwaccels = Array.Empty<string>(); private List<string> _hwaccels = new List<string>();
public void SetAvailableHwaccels(IEnumerable<string> list) public void SetAvailableHwaccels(IEnumerable<string> list)
{ {
_hwaccels = list.ToList(); _hwaccels = list.ToList();