Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
c27e60d2d8
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user