mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-20 20:50:36 +02:00
Merge pull request #2170 from Bond-009/mediainfoservice
Minor changes to MediaInfoService
This commit is contained in:
commit
a272638a84
|
@ -1,6 +1,13 @@
|
||||||
|
#pragma warning disable CS1591
|
||||||
|
#pragma warning disable SA1402
|
||||||
|
#pragma warning disable SA1600
|
||||||
|
#pragma warning disable SA1649
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Buffers;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Text.Json;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
@ -54,7 +61,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
public class GetBitrateTestBytes
|
public class GetBitrateTestBytes
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "Size", Description = "Size", IsRequired = true, DataType = "int", ParameterType = "query", Verb = "GET")]
|
[ApiMember(Name = "Size", Description = "Size", IsRequired = true, DataType = "int", ParameterType = "query", Verb = "GET")]
|
||||||
public long Size { get; set; }
|
public int Size { get; set; }
|
||||||
|
|
||||||
public GetBitrateTestBytes()
|
public GetBitrateTestBytes()
|
||||||
{
|
{
|
||||||
|
@ -72,7 +79,6 @@ namespace MediaBrowser.Api.Playback
|
||||||
private readonly INetworkManager _networkManager;
|
private readonly INetworkManager _networkManager;
|
||||||
private readonly IMediaEncoder _mediaEncoder;
|
private readonly IMediaEncoder _mediaEncoder;
|
||||||
private readonly IUserManager _userManager;
|
private readonly IUserManager _userManager;
|
||||||
private readonly IJsonSerializer _json;
|
|
||||||
private readonly IAuthorizationContext _authContext;
|
private readonly IAuthorizationContext _authContext;
|
||||||
|
|
||||||
public MediaInfoService(
|
public MediaInfoService(
|
||||||
|
@ -85,7 +91,6 @@ namespace MediaBrowser.Api.Playback
|
||||||
INetworkManager networkManager,
|
INetworkManager networkManager,
|
||||||
IMediaEncoder mediaEncoder,
|
IMediaEncoder mediaEncoder,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
IJsonSerializer json,
|
|
||||||
IAuthorizationContext authContext)
|
IAuthorizationContext authContext)
|
||||||
: base(logger, serverConfigurationManager, httpResultFactory)
|
: base(logger, serverConfigurationManager, httpResultFactory)
|
||||||
{
|
{
|
||||||
|
@ -95,20 +100,35 @@ namespace MediaBrowser.Api.Playback
|
||||||
_networkManager = networkManager;
|
_networkManager = networkManager;
|
||||||
_mediaEncoder = mediaEncoder;
|
_mediaEncoder = mediaEncoder;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
_json = json;
|
|
||||||
_authContext = authContext;
|
_authContext = authContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
public object Get(GetBitrateTestBytes request)
|
public object Get(GetBitrateTestBytes request)
|
||||||
{
|
{
|
||||||
var bytes = new byte[request.Size];
|
const int MaxSize = 10_000_000;
|
||||||
|
|
||||||
for (var i = 0; i < bytes.Length; i++)
|
var size = request.Size;
|
||||||
|
|
||||||
|
if (size <= 0)
|
||||||
{
|
{
|
||||||
bytes[i] = 0;
|
throw new ArgumentException($"The requested size ({size}) is equal to or smaller than 0.", nameof(request));
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResultFactory.GetResult(null, bytes, "application/octet-stream");
|
if (size > MaxSize)
|
||||||
|
{
|
||||||
|
throw new ArgumentException($"The requested size ({size}) is larger than the max allowed value ({MaxSize}).", nameof(request));
|
||||||
|
}
|
||||||
|
|
||||||
|
byte[] buffer = ArrayPool<byte>.Shared.Rent(size);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
new Random().NextBytes(buffer);
|
||||||
|
return ResultFactory.GetResult(null, buffer, "application/octet-stream");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
ArrayPool<byte>.Shared.Return(buffer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<object> Get(GetPlaybackInfo request)
|
public async Task<object> Get(GetPlaybackInfo request)
|
||||||
|
@ -166,8 +186,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 +195,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}", profile);
|
||||||
|
|
||||||
if (profile == null)
|
if (profile == null)
|
||||||
{
|
{
|
||||||
|
@ -215,9 +234,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 };
|
||||||
|
@ -251,9 +268,8 @@ namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
// Since we're going to be setting properties on MediaSourceInfos that come out of _mediaSourceManager, we should clone it
|
// Since we're going to be setting properties on MediaSourceInfos that come out of _mediaSourceManager, we should clone it
|
||||||
// Should we move this directly into MediaSourceManager?
|
// Should we move this directly into MediaSourceManager?
|
||||||
|
var json = JsonSerializer.SerializeToUtf8Bytes(obj);
|
||||||
var json = _json.SerializeToString(obj);
|
return JsonSerializer.Deserialize<T>(json);
|
||||||
return _json.DeserializeFromString<T>(json);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<PlaybackInfoResponse> GetPlaybackInfo(Guid id, Guid userId, string[] supportedLiveMediaTypes, string mediaSourceId = null, string liveStreamId = null)
|
private async Task<PlaybackInfoResponse> GetPlaybackInfo(Guid id, Guid userId, string[] supportedLiveMediaTypes, string mediaSourceId = null, string liveStreamId = null)
|
||||||
|
@ -294,7 +310,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
result.MediaSources = new MediaSourceInfo[] { mediaSource };
|
result.MediaSources = new MediaSourceInfo[] { mediaSource };
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result.MediaSources.Length == 0)
|
if (result.MediaSources.Count == 0)
|
||||||
{
|
{
|
||||||
if (!result.ErrorCode.HasValue)
|
if (!result.ErrorCode.HasValue)
|
||||||
{
|
{
|
||||||
|
@ -311,7 +327,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 +356,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 +401,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 +454,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 +493,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 +513,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 +530,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;
|
||||||
}
|
}
|
||||||
|
@ -609,14 +631,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)
|
||||||
|
|
|
@ -74,7 +74,6 @@ namespace MediaBrowser.Api.Playback
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
public class UniversalAudioService : BaseApiService
|
public class UniversalAudioService : BaseApiService
|
||||||
{
|
{
|
||||||
private readonly ILoggerFactory _loggerFactory;
|
|
||||||
private readonly EncodingHelper _encodingHelper;
|
private readonly EncodingHelper _encodingHelper;
|
||||||
|
|
||||||
public UniversalAudioService(
|
public UniversalAudioService(
|
||||||
|
@ -243,7 +242,6 @@ namespace MediaBrowser.Api.Playback
|
||||||
NetworkManager,
|
NetworkManager,
|
||||||
MediaEncoder,
|
MediaEncoder,
|
||||||
UserManager,
|
UserManager,
|
||||||
JsonSerializer,
|
|
||||||
AuthorizationContext)
|
AuthorizationContext)
|
||||||
{
|
{
|
||||||
Request = Request
|
Request = Request
|
||||||
|
|
|
@ -1,15 +1,20 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using MediaBrowser.Model.Dlna;
|
using MediaBrowser.Model.Dlna;
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
|
|
||||||
namespace MediaBrowser.Model.MediaInfo
|
namespace MediaBrowser.Model.MediaInfo
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Class PlaybackInfoResponse.
|
||||||
|
/// </summary>
|
||||||
public class PlaybackInfoResponse
|
public class PlaybackInfoResponse
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the media sources.
|
/// Gets or sets the media sources.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The media sources.</value>
|
/// <value>The media sources.</value>
|
||||||
public MediaSourceInfo[] MediaSources { get; set; }
|
public IReadOnlyList<MediaSourceInfo> MediaSources { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the play session identifier.
|
/// Gets or sets the play session identifier.
|
||||||
|
@ -23,9 +28,12 @@ namespace MediaBrowser.Model.MediaInfo
|
||||||
/// <value>The error code.</value>
|
/// <value>The error code.</value>
|
||||||
public PlaybackErrorCode? ErrorCode { get; set; }
|
public PlaybackErrorCode? ErrorCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="PlaybackInfoResponse" /> class.
|
||||||
|
/// </summary>
|
||||||
public PlaybackInfoResponse()
|
public PlaybackInfoResponse()
|
||||||
{
|
{
|
||||||
MediaSources = new MediaSourceInfo[] { };
|
MediaSources = Array.Empty<MediaSourceInfo>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue