lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow disabling of hardware transcoding on HDTC-2US

Browse Source
This commit is contained in:
Daniel Becker 2016-04-03 23:46:45 -07:00
parent 1071a5a5f3
commit c9092de032
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/LiveTv/LiveTvOptions.cs
View File

@ -31,6 +31,7 @@ namespace MediaBrowser.Model.LiveTv
public string Type { get; set; } public string Type { get; set; }
public string DeviceId { get; set; } public string DeviceId { get; set; }
public bool ImportFavoritesOnly { get; set; } public bool ImportFavoritesOnly { get; set; }
public bool AllowHWTranscoding { get; set; }
public bool IsEnabled { get; set; } public bool IsEnabled { get; set; }
public string M3UUrl { get; set; } public string M3UUrl { get; set; }
public string InfoUrl { get; set; } public string InfoUrl { get; set; }
@ -47,6 +48,7 @@ namespace MediaBrowser.Model.LiveTv
public TunerHostInfo() public TunerHostInfo()
{ {
IsEnabled = true; IsEnabled = true;
AllowHWTranscoding = true;
} }
} }
@ -70,4 +72,4 @@ namespace MediaBrowser.Model.LiveTv
EnableAllTuners = true; EnableAllTuners = true;
} }
} }
} }

2
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View File

@ -397,7 +397,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
string model = await GetModelInfo(info, cancellationToken).ConfigureAwait(false); string model = await GetModelInfo(info, cancellationToken).ConfigureAwait(false);
model = model ?? string.Empty; model = model ?? string.Empty;
if (model.IndexOf("hdtc", StringComparison.OrdinalIgnoreCase) != -1) if (info.AllowHWTranscoding && (model.IndexOf("hdtc", StringComparison.OrdinalIgnoreCase) != -1))
{ {
list.Add(await GetMediaSource(info, hdhrId, "heavy").ConfigureAwait(false)); list.Add(await GetMediaSource(info, hdhrId, "heavy").ConfigureAwait(false));