aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-04-19 12:57:06 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-04-19 12:57:06 -0400
commit099f8037c520b8ada4c1701a96c464503acd458e (patch)
treef50d058f6746188eae4439956d35631146a360cb /Emby.Server.Implementations
parentb51beedd942e09b51d6300aedffebc0a47f5fd50 (diff)
don't read user data from nfo's anymore
Diffstat (limited to 'Emby.Server.Implementations')
-rw-r--r--Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs13
-rw-r--r--Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs11
2 files changed, 17 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
index 053af4fc6..4efef4470 100644
--- a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
@@ -82,19 +82,24 @@ namespace Emby.Server.Implementations.LiveTv
{
var width = videoStream.Width ?? 1920;
- if (width >= 1900)
+ if (width >= 3000)
+ {
+ videoStream.BitRate = 25000000;
+ }
+
+ else if (width >= 1900)
{
videoStream.BitRate = 15000000;
}
- else if (width >= 1260)
+ else if (width >= 1200)
{
- videoStream.BitRate = 3000000;
+ videoStream.BitRate = 4000000;
}
else if (width >= 700)
{
- videoStream.BitRate = 1000000;
+ videoStream.BitRate = 1500000;
}
}
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index 329f5b8a4..220c503d1 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -183,19 +183,24 @@ namespace Emby.Server.Implementations.LiveTv
{
var width = videoStream.Width ?? 1920;
- if (width >= 1900)
+ if (width >= 3000)
+ {
+ videoStream.BitRate = 25000000;
+ }
+
+ else if (width >= 1900)
{
videoStream.BitRate = 15000000;
}
- else if (width >= 1260)
+ else if (width >= 1200)
{
videoStream.BitRate = 4000000;
}
else if (width >= 700)
{
- videoStream.BitRate = 1000000;
+ videoStream.BitRate = 1500000;
}
}
}