Merge pull request #1645 from vicpa/dev

qsv encode liveTV
pull/702/head
Luke 9 years ago
commit e34dc6701b

@ -288,11 +288,9 @@ namespace MediaBrowser.Api.Playback
{ {
if (string.Equals(ApiEntryPoint.Instance.GetEncodingOptions().HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase)) if (string.Equals(ApiEntryPoint.Instance.GetEncodingOptions().HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
{ {
// It's currently failing on live tv
if (state.RunTimeTicks.HasValue)
{
return "h264_qsv"; return "h264_qsv";
}
} }
return "libx264"; return "libx264";
@ -440,6 +438,8 @@ namespace MediaBrowser.Api.Playback
param += " -level " + state.VideoRequest.Level; param += " -level " + state.VideoRequest.Level;
break; break;
} }
return param;
} }
else else
{ {

Loading…
Cancel
Save