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

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2016-04-06 23:08:13 -04:00
commit c27e60d2d8
2 changed files with 7 additions and 12 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;
} }
} }
} }

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

@ -263,18 +263,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
videoCodec = "h264"; videoCodec = "h264";
videoBitrate = 15000000; videoBitrate = 15000000;
} }
else if (string.Equals(profile, "internet720", StringComparison.OrdinalIgnoreCase))
{
width = 1280;
height = 720;
isInterlaced = false;
videoCodec = "h264";
videoBitrate = 8000000;
}
else if (string.Equals(profile, "internet540", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(profile, "internet540", StringComparison.OrdinalIgnoreCase))
{ {
width = 1280; width = 960;
height = 720; height = 546;
isInterlaced = false; isInterlaced = false;
videoCodec = "h264"; videoCodec = "h264";
videoBitrate = 2500000; videoBitrate = 2500000;
@ -397,10 +389,11 @@ 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));
list.Add(await GetMediaSource(info, hdhrId, "internet540").ConfigureAwait(false));
list.Add(await GetMediaSource(info, hdhrId, "internet480").ConfigureAwait(false)); list.Add(await GetMediaSource(info, hdhrId, "internet480").ConfigureAwait(false));
list.Add(await GetMediaSource(info, hdhrId, "internet360").ConfigureAwait(false)); list.Add(await GetMediaSource(info, hdhrId, "internet360").ConfigureAwait(false));
list.Add(await GetMediaSource(info, hdhrId, "internet240").ConfigureAwait(false)); list.Add(await GetMediaSource(info, hdhrId, "internet240").ConfigureAwait(false));