lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

increase chances of stream copy

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-28 03:16:45 -05:00
parent 28bbe32d1d
commit db9eb64e9f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -1967,7 +1967,12 @@ namespace MediaBrowser.Api.Playback
state.OutputVideoCodec = state.VideoRequest.VideoCodec;
state.OutputVideoBitrate = GetVideoBitrateParamValue(state.VideoRequest, state.VideoStream, state.OutputVideoCodec);
if (state.OutputVideoBitrate.HasValue)
if (videoRequest != null)
{
TryStreamCopy(state, videoRequest);
}
if (state.OutputVideoBitrate.HasValue && !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
{
var resolution = ResolutionNormalizer.Normalize(
state.VideoStream == null ? (int?) null : state.VideoStream.BitRate,
@ -1980,13 +1985,12 @@ namespace MediaBrowser.Api.Playback
videoRequest.MaxWidth = resolution.MaxWidth;
videoRequest.MaxHeight = resolution.MaxHeight;
}
}
ApplyDeviceProfileSettings(state);
if (videoRequest != null)
}
else
{
TryStreamCopy(state, videoRequest);
ApplyDeviceProfileSettings(state);
}
state.OutputFilePath = GetOutputFilePath(state);