|
|
|
@ -821,9 +821,14 @@ namespace MediaBrowser.Api.Playback
|
|
|
|
|
/// <returns>System.String.</returns>
|
|
|
|
|
protected string GetVideoDecoder(StreamState state)
|
|
|
|
|
{
|
|
|
|
|
if (string.Equals(ApiEntryPoint.Instance.GetEncodingOptions().HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
if (string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state.VideoStream != null && !string.IsNullOrWhiteSpace(state.VideoStream.Codec))
|
|
|
|
|
{
|
|
|
|
|
if (string.Equals(ApiEntryPoint.Instance.GetEncodingOptions().HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
switch (state.MediaSource.VideoStream.Codec.ToLower())
|
|
|
|
|
{
|
|
|
|
@ -831,7 +836,8 @@ namespace MediaBrowser.Api.Playback
|
|
|
|
|
case "h264":
|
|
|
|
|
if (MediaEncoder.SupportsDecoder("h264_qsv"))
|
|
|
|
|
{
|
|
|
|
|
return "-c:v h264_qsv ";
|
|
|
|
|
// Seeing stalls and failures with decoding. Not worth it compared to encoding.
|
|
|
|
|
//return "-c:v h264_qsv ";
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case "mpeg2video":
|
|
|
|
|