Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1645 from vicpa/dev

Browse Source 
qsv encode liveTV
This commit is contained in:
Luke 2016-04-14 12:41:59 -04:00
commit e34dc6701b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -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
{ {