starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-15 21:43:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve cancellation support of auto-organize

Browse Source
This commit is contained in:
Luke Pulverenti
2017-03-29 15:16:43 -04:00
parent cb5c9333c5
commit f641c501a7
10 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -743,6 +743,11 @@ namespace MediaBrowser.Controller.MediaEncoding
public bool CanStreamCopyVideo(EncodingJobInfo state, MediaStream videoStream)
{
if (!videoStream.AllowStreamCopy)
{
return false;
}
var request = state.BaseRequest;
if (videoStream.IsInterlaced)
@@ -883,6 +888,11 @@ namespace MediaBrowser.Controller.MediaEncoding
public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs)
{
if (!audioStream.AllowStreamCopy)
{
return false;
}
var request = state.BaseRequest;
// Source and target codecs must match