Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 14:10:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #761 from tikuf/master

Browse source 
Stop judder in webm from high bitrate source files
This commit is contained in:
Luke 2014-04-02 13:57:44 -04:00
parent 6fe7264f78 fcff9a6df5
commit dcf2e70f03
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MediaBrowser.Api/Playback/BaseStreamingService.cs
View file

@ -294,7 +294,7 @@ namespace MediaBrowser.Api.Playback
{ {
if (isWebm) if (isWebm)
{ {
return Math.Max(Environment.ProcessorCount - 1, 1); return Math.Max(Environment.ProcessorCount - 1, 2);
} }
return 0; return 0;
@ -309,9 +309,9 @@ namespace MediaBrowser.Api.Playback
case EncodingQuality.HighSpeed: case EncodingQuality.HighSpeed:
return 2; return 2;
case EncodingQuality.HighQuality: case EncodingQuality.HighQuality:
return isWebm ? Math.Max(Environment.ProcessorCount - 1, 1) : 0; return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0;
case EncodingQuality.MaxQuality: case EncodingQuality.MaxQuality:
return isWebm ? Math.Max(Environment.ProcessorCount - 1, 1) : 0; return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0;
default: default:
throw new Exception("Unrecognized MediaEncodingQuality value."); throw new Exception("Unrecognized MediaEncodingQuality value.");
} }
@ -1005,8 +1005,8 @@ namespace MediaBrowser.Api.Playback
} }
// With vpx when crf is used, b:v becomes a max rate // With vpx when crf is used, b:v becomes a max rate
// https://trac.ffmpeg.org/wiki/vpxEncodingGuide // https://trac.ffmpeg.org/wiki/vpxEncodingGuide. But higher bitrate source files -b:v causes judder so limite the bitrate but dont allow it to "saturate" the bitrate. So dont contrain it down just up.
return string.Format(" -b:v {0}", bitrate.Value.ToString(UsCulture)); return string.Format(" -maxrate:v {0} -bufsize:v ({0}*2) -b:v {0}", bitrate.Value.ToString(UsCulture));
} }
if (string.Equals(videoCodec, "msmpeg4", StringComparison.OrdinalIgnoreCase)) if (string.Equals(videoCodec, "msmpeg4", StringComparison.OrdinalIgnoreCase))