diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-24 11:04:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 11:04:34 -0400 |
| commit | e96b9cb05c3c5d71adf5918f862dfb66155ca0ea (patch) | |
| tree | 2c202f33338bbcf2bc67c902e815c836afdb85b1 /MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs | |
| parent | 410a75d03d9904cd3e8c33b11ac8a85cfd3f7f42 (diff) | |
| parent | aa8f3cd493509ce4d6af836d3f231e7437a8ae49 (diff) | |
Merge pull request #2543 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs index 449c31ace..883709de8 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs @@ -377,7 +377,7 @@ namespace MediaBrowser.MediaEncoding.Encoder return count; } - public void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded) + public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate) { var ticks = transcodingPosition.HasValue ? transcodingPosition.Value.Ticks : (long?)null; @@ -385,8 +385,8 @@ namespace MediaBrowser.MediaEncoding.Encoder if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue) { - var pct = ticks.Value/RunTimeTicks.Value; - percentComplete = pct*100; + var pct = ticks.Value / RunTimeTicks.Value; + percentComplete = pct * 100; } if (percentComplete.HasValue) |
