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

more work on streaming remotely

Browse Source
This commit is contained in:
Luke Pulverenti
2013-05-01 22:44:52 -04:00
parent e9cfa6cd26
commit b11d06f36f
6 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,30 +264,24 @@ namespace MediaBrowser.Api.Playback
}
// If a max width was requested
if (request.MaxWidth.HasValue && !request.MaxHeight.HasValue)
if (request.MaxWidth.HasValue && (!request.MaxHeight.HasValue || state.VideoStream == null))
{
return isH264Output ?
string.Format(" -vf \"scale=min(iw\\,{0}):trunc(ow/a/2)*2{1}\"", request.MaxWidth.Value, assSubtitleParam) :
string.Format(" -vf \"scale=min(iw\\,{0}):-1{1}\"", request.MaxWidth.Value, assSubtitleParam);
}
if (state.VideoStream == null)
{
// No way to figure this out
return string.Empty;
}
// Need to perform calculations manually
// Try to account for bad media info
var currentHeight = request.MaxHeight ?? request.Height ?? 0;
var currentWidth = request.MaxWidth ?? request.Width ?? 0;
if (state.VideoStream != null)
{
if (state.VideoStream.Height.HasValue)
{
currentHeight = state.VideoStream.Height.Value;
}
if (state.VideoStream.Width.HasValue)
{
currentWidth = state.VideoStream.Width.Value;
}
}
var currentHeight = state.VideoStream.Height ?? request.MaxHeight ?? request.Height ?? 0;
var currentWidth = state.VideoStream.Width ?? request.MaxWidth ?? request.Width ?? 0;
var outputSize = DrawingUtils.Resize(currentWidth, currentHeight, request.Width, request.Height, request.MaxWidth, request.MaxHeight);