michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2337 from ThreeFive-O/AddTranscodingFramerate

Browse Source 
Add transcoding framerate info
This commit is contained in:
dkanada 2020-01-26 01:06:28 +09:00 committed by GitHub
commit e58aa57ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/StreamState.cs
View File

@ -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);
} }

2
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

@ -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);
} }

2
MediaBrowser.Controller/MediaEncoding/JobLogger.cs
View File

@ -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);
} }
} }
} }