瀏覽代碼

Merge pull request #2337 from ThreeFive-O/AddTranscodingFramerate

Add transcoding framerate info
dkanada 5 年之前
父節點
當前提交
e58aa57ed7

+ 1 - 1
MediaBrowser.Api/Playback/StreamState.cs

@@ -103,7 +103,7 @@ namespace MediaBrowser.Api.Playback
             _mediaSourceManager = mediaSourceManager;
             _mediaSourceManager = mediaSourceManager;
         }
         }
 
 
-        public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate)
+        public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate)
         {
         {
             ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate);
             ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate);
         }
         }

+ 1 - 1
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs

@@ -665,7 +665,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         }
         }
 
 
         public IProgress<double> Progress { get; set; }
         public IProgress<double> Progress { get; set; }
-        public virtual void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate)
+        public virtual void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate)
         {
         {
             Progress.Report(percentComplete.Value);
             Progress.Report(percentComplete.Value);
         }
         }

+ 1 - 1
MediaBrowser.Controller/MediaEncoding/JobLogger.cs

@@ -146,7 +146,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
 
             if (framerate.HasValue || percent.HasValue)
             if (framerate.HasValue || percent.HasValue)
             {
             {
-                state.ReportTranscodingProgress(transcodingPosition, 0, percent, 0, bitRate);
+                state.ReportTranscodingProgress(transcodingPosition, framerate, percent, bytesTranscoded, bitRate);
             }
             }
         }
         }
     }
     }