diff options
| author | Luke <luke.pulverenti@gmail.com> | 2014-04-16 08:49:10 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2014-04-16 08:49:10 -0400 |
| commit | 460e4cbd1f8a4207d1e31938f0bcb87832eda229 (patch) | |
| tree | 703e394d1bd095ec886b97dc5a17f09b6d68493a | |
| parent | ea182931dbe3370225d85a10870ae57330461a40 (diff) | |
| parent | cf55f894c5577d4f1fd5082ab3642275960f0b48 (diff) | |
Merge pull request #785 from tikuf/master
Webm adjustments to cpu threads and quality
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index e588068d0..15cac7e3b 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -300,7 +300,7 @@ namespace MediaBrowser.Api.Playback case EncodingQuality.HighSpeed: return 2; case EncodingQuality.HighQuality: - return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0; + return isWebm ? Math.Max((int)((Environment.ProcessorCount -1) / 2) , 2) : 0; case EncodingQuality.MaxQuality: return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0; default: @@ -364,14 +364,16 @@ namespace MediaBrowser.Api.Playback switch (qualitySetting) { case EncodingQuality.HighSpeed: - crf = "18"; - profileScore++; + crf = "12"; + profileScore = 2; break; case EncodingQuality.HighQuality: - crf = "10"; + crf = "8"; + profileScore = 1; break; case EncodingQuality.MaxQuality: crf = "4"; + //profilescore aready set to 0 break; default: throw new ArgumentException("Unrecognized quality setting"); @@ -379,7 +381,7 @@ namespace MediaBrowser.Api.Playback if (isVc1) { - profileScore++; + profileScore = 1; } // http://www.webmproject.org/docs/encoder-parameters/ diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs index efce91770..cdd9df49b 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs @@ -224,7 +224,7 @@ namespace MediaBrowser.MediaEncoding.Encoder case EncodingQuality.HighSpeed: return 2; case EncodingQuality.HighQuality: - return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0; + return isWebm ? Math.Max((int)((Environment.ProcessorCount -1) / 2) , 2) : 0; case EncodingQuality.MaxQuality: return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0; default: |