diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-19 12:57:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 12:57:53 -0400 |
| commit | 3cd37ed3c77b94cb76992f9a29c99cd3f285bb75 (patch) | |
| tree | 59d97a401f81e362f3c8348cbf9e339fda04323d /Emby.Server.Implementations | |
| parent | 8ca84af79245a77b361e64271e5933311c5914ea (diff) | |
| parent | 0dad3d0e711da642b80cc2f8bc7521e67dd4eaf5 (diff) | |
Merge pull request #2586 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs | 13 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs | 11 |
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; } } } |