mirror of https://github.com/jellyfin/jellyfin.git
Minor changes to MediaInfoService
This commit is contained in:
parent
bc7cbfb21a
commit
a5cd11735c
|
@ -102,12 +102,6 @@ namespace MediaBrowser.Api.Playback
|
||||||
public object Get(GetBitrateTestBytes request)
|
public object Get(GetBitrateTestBytes request)
|
||||||
{
|
{
|
||||||
var bytes = new byte[request.Size];
|
var bytes = new byte[request.Size];
|
||||||
|
|
||||||
for (var i = 0; i < bytes.Length; i++)
|
|
||||||
{
|
|
||||||
bytes[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultFactory.GetResult(null, bytes, "application/octet-stream");
|
return ResultFactory.GetResult(null, bytes, "application/octet-stream");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,8 +160,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
|
|
||||||
public void Post(CloseMediaSource request)
|
public void Post(CloseMediaSource request)
|
||||||
{
|
{
|
||||||
var task = _mediaSourceManager.CloseLiveStream(request.LiveStreamId);
|
_mediaSourceManager.CloseLiveStream(request.LiveStreamId).GetAwaiter().GetResult();
|
||||||
Task.WaitAll(task);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<PlaybackInfoResponse> GetPlaybackInfo(GetPostedPlaybackInfo request)
|
public async Task<PlaybackInfoResponse> GetPlaybackInfo(GetPostedPlaybackInfo request)
|
||||||
|
@ -176,7 +169,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
|
|
||||||
var profile = request.DeviceProfile;
|
var profile = request.DeviceProfile;
|
||||||
|
|
||||||
//Logger.LogInformation("GetPostedPlaybackInfo profile: {profile}", _json.SerializeToString(profile));
|
Logger.LogInformation("GetPostedPlaybackInfo profile: {profile}", _json.SerializeToString(profile));
|
||||||
|
|
||||||
if (profile == null)
|
if (profile == null)
|
||||||
{
|
{
|
||||||
|
@ -215,9 +208,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
StartTimeTicks = request.StartTimeTicks,
|
StartTimeTicks = request.StartTimeTicks,
|
||||||
SubtitleStreamIndex = request.SubtitleStreamIndex,
|
SubtitleStreamIndex = request.SubtitleStreamIndex,
|
||||||
UserId = request.UserId,
|
UserId = request.UserId,
|
||||||
OpenToken = mediaSource.OpenToken,
|
OpenToken = mediaSource.OpenToken
|
||||||
//EnableMediaProbe = request.EnableMediaProbe
|
|
||||||
|
|
||||||
}).ConfigureAwait(false);
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
info.MediaSources = new MediaSourceInfo[] { openStreamResult.MediaSource };
|
info.MediaSources = new MediaSourceInfo[] { openStreamResult.MediaSource };
|
||||||
|
@ -311,7 +302,8 @@ namespace MediaBrowser.Api.Playback
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetDeviceSpecificData(Guid itemId,
|
private void SetDeviceSpecificData(
|
||||||
|
Guid itemId,
|
||||||
PlaybackInfoResponse result,
|
PlaybackInfoResponse result,
|
||||||
DeviceProfile profile,
|
DeviceProfile profile,
|
||||||
AuthorizationInfo auth,
|
AuthorizationInfo auth,
|
||||||
|
@ -339,7 +331,8 @@ namespace MediaBrowser.Api.Playback
|
||||||
SortMediaSources(result, maxBitrate);
|
SortMediaSources(result, maxBitrate);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetDeviceSpecificData(BaseItem item,
|
private void SetDeviceSpecificData(
|
||||||
|
BaseItem item,
|
||||||
MediaSourceInfo mediaSource,
|
MediaSourceInfo mediaSource,
|
||||||
DeviceProfile profile,
|
DeviceProfile profile,
|
||||||
AuthorizationInfo auth,
|
AuthorizationInfo auth,
|
||||||
|
@ -383,10 +376,12 @@ namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
mediaSource.SupportsDirectPlay = false;
|
mediaSource.SupportsDirectPlay = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!enableDirectStream)
|
if (!enableDirectStream)
|
||||||
{
|
{
|
||||||
mediaSource.SupportsDirectStream = false;
|
mediaSource.SupportsDirectStream = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!enableTranscoding)
|
if (!enableTranscoding)
|
||||||
{
|
{
|
||||||
mediaSource.SupportsTranscoding = false;
|
mediaSource.SupportsTranscoding = false;
|
||||||
|
@ -434,9 +429,9 @@ namespace MediaBrowser.Api.Playback
|
||||||
}
|
}
|
||||||
|
|
||||||
// The MediaSource supports direct stream, now test to see if the client supports it
|
// The MediaSource supports direct stream, now test to see if the client supports it
|
||||||
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) ?
|
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase)
|
||||||
streamBuilder.BuildAudioItem(options) :
|
? streamBuilder.BuildAudioItem(options)
|
||||||
streamBuilder.BuildVideoItem(options);
|
: streamBuilder.BuildVideoItem(options);
|
||||||
|
|
||||||
if (streamInfo == null || !streamInfo.IsDirectStream)
|
if (streamInfo == null || !streamInfo.IsDirectStream)
|
||||||
{
|
{
|
||||||
|
@ -473,9 +468,9 @@ namespace MediaBrowser.Api.Playback
|
||||||
}
|
}
|
||||||
|
|
||||||
// The MediaSource supports direct stream, now test to see if the client supports it
|
// The MediaSource supports direct stream, now test to see if the client supports it
|
||||||
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) ?
|
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase)
|
||||||
streamBuilder.BuildAudioItem(options) :
|
? streamBuilder.BuildAudioItem(options)
|
||||||
streamBuilder.BuildVideoItem(options);
|
: streamBuilder.BuildVideoItem(options);
|
||||||
|
|
||||||
if (streamInfo == null || !streamInfo.IsDirectStream)
|
if (streamInfo == null || !streamInfo.IsDirectStream)
|
||||||
{
|
{
|
||||||
|
@ -493,9 +488,9 @@ namespace MediaBrowser.Api.Playback
|
||||||
options.MaxBitrate = GetMaxBitrate(maxBitrate, user);
|
options.MaxBitrate = GetMaxBitrate(maxBitrate, user);
|
||||||
|
|
||||||
// The MediaSource supports direct stream, now test to see if the client supports it
|
// The MediaSource supports direct stream, now test to see if the client supports it
|
||||||
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) ?
|
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase)
|
||||||
streamBuilder.BuildAudioItem(options) :
|
? streamBuilder.BuildAudioItem(options)
|
||||||
streamBuilder.BuildVideoItem(options);
|
: streamBuilder.BuildVideoItem(options);
|
||||||
|
|
||||||
if (streamInfo != null)
|
if (streamInfo != null)
|
||||||
{
|
{
|
||||||
|
@ -510,10 +505,12 @@ namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false";
|
mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!allowAudioStreamCopy)
|
if (!allowAudioStreamCopy)
|
||||||
{
|
{
|
||||||
mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
|
mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
|
||||||
}
|
}
|
||||||
|
|
||||||
mediaSource.TranscodingContainer = streamInfo.Container;
|
mediaSource.TranscodingContainer = streamInfo.Container;
|
||||||
mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol;
|
mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol;
|
||||||
}
|
}
|
||||||
|
@ -599,14 +596,11 @@ namespace MediaBrowser.Api.Playback
|
||||||
|
|
||||||
}).ThenBy(i =>
|
}).ThenBy(i =>
|
||||||
{
|
{
|
||||||
switch (i.Protocol)
|
return i.Protocol switch
|
||||||
{
|
{
|
||||||
case MediaProtocol.File:
|
MediaProtocol.File => 0,
|
||||||
return 0;
|
_ => 1,
|
||||||
default:
|
};
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
}).ThenBy(i =>
|
}).ThenBy(i =>
|
||||||
{
|
{
|
||||||
if (maxBitrate.HasValue)
|
if (maxBitrate.HasValue)
|
||||||
|
|
Loading…
Reference in New Issue