diff options
Diffstat (limited to 'MediaBrowser.Api/Playback')
7 files changed, 69 insertions, 40 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index bc07f93de..882eaae69 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -219,7 +219,7 @@ namespace MediaBrowser.Api.Playback var assSubtitleParam = string.Empty; - var request = state.Request; + var request = state.VideoRequest; if (state.SubtitleStream != null) { @@ -354,7 +354,7 @@ namespace MediaBrowser.Api.Playback { var outputSizeParam = string.Empty; - var request = state.Request; + var request = state.VideoRequest; // Add resolution params, if specified if (request.Width.HasValue || request.Height.HasValue || request.MaxHeight.HasValue || request.MaxWidth.HasValue) @@ -439,7 +439,7 @@ namespace MediaBrowser.Api.Playback /// </summary> /// <param name="request">The request.</param> /// <returns>System.String.</returns> - protected string GetVideoCodec(StreamRequest request) + protected string GetVideoCodec(VideoStreamRequest request) { var codec = request.VideoCodec; @@ -630,20 +630,29 @@ namespace MediaBrowser.Api.Playback { request.AudioCodec = InferAudioCodec(url); } - if (!request.VideoCodec.HasValue) - { - request.VideoCodec = InferVideoCodec(url); - } - return new StreamState + var state = new StreamState { Item = item, Request = request, - AudioStream = GetMediaStream(media.MediaStreams, request.AudioStreamIndex, MediaStreamType.Audio, true), - VideoStream = GetMediaStream(media.MediaStreams, request.VideoStreamIndex, MediaStreamType.Video, true), - SubtitleStream = GetMediaStream(media.MediaStreams, request.SubtitleStreamIndex, MediaStreamType.Subtitle, false), Url = url }; + + var videoRequest = request as VideoStreamRequest; + + if (videoRequest != null) + { + if (!videoRequest.VideoCodec.HasValue) + { + videoRequest.VideoCodec = InferVideoCodec(url); + } + + state.AudioStream = GetMediaStream(media.MediaStreams, videoRequest.AudioStreamIndex, MediaStreamType.Audio, true); + state.VideoStream = GetMediaStream(media.MediaStreams, videoRequest.VideoStreamIndex, MediaStreamType.Video, true); + state.SubtitleStream = GetMediaStream(media.MediaStreams, videoRequest.SubtitleStreamIndex, MediaStreamType.Subtitle, false); + } + + return state; } /// <summary> diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 7fcd4357b..39e1ca9d0 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -60,7 +60,7 @@ namespace MediaBrowser.Api.Playback.Hls /// <returns>System.String.</returns> protected override string GetVideoArguments(StreamState state) { - var codec = GetVideoCodec(state.Request); + var codec = GetVideoCodec(state.VideoRequest); // Right now all we support is either h264 or copy if (!codec.Equals("copy", StringComparison.OrdinalIgnoreCase) && !codec.Equals("libx264", StringComparison.OrdinalIgnoreCase)) @@ -76,19 +76,19 @@ namespace MediaBrowser.Api.Playback.Hls var args = "-codec:v:0 " + codec + " -preset superfast"; - if (state.Request.VideoBitRate.HasValue) + if (state.VideoRequest.VideoBitRate.HasValue) { - args += string.Format(" -b:v {0}", state.Request.VideoBitRate.Value); + args += string.Format(" -b:v {0}", state.VideoRequest.VideoBitRate.Value); } // Add resolution params, if specified - if (state.Request.Width.HasValue || state.Request.Height.HasValue || state.Request.MaxHeight.HasValue || state.Request.MaxWidth.HasValue) + if (state.VideoRequest.Width.HasValue || state.VideoRequest.Height.HasValue || state.VideoRequest.MaxHeight.HasValue || state.VideoRequest.MaxWidth.HasValue) { args += GetOutputSizeParam(state, codec); } // Get the output framerate based on the FrameRate param - double framerate = state.Request.Framerate ?? 0; + double framerate = state.VideoRequest.Framerate ?? 0; // We have to supply a framerate for hls, so if it's null, account for that here if (framerate.Equals(0)) diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs index 86d993152..3581d006e 100644 --- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs +++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs @@ -15,6 +15,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Audio/{Id}/stream.flac", "GET")] [Route("/Audio/{Id}/stream.ogg", "GET")] [Route("/Audio/{Id}/stream", "GET")] + [ServiceStack.ServiceHost.Api(Description = "Gets an audio stream")] public class GetAudioStream : StreamRequest { diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs index c2cdf1f9b..251cd4bd6 100644 --- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs +++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs @@ -34,14 +34,16 @@ namespace MediaBrowser.Api.Playback.Progressive return ext; } + var videoRequest = state.Request as VideoStreamRequest; + // Try to infer based on the desired video codec - if (state.Request.VideoCodec.HasValue) + if (videoRequest != null && videoRequest.VideoCodec.HasValue) { var video = state.Item as Video; if (video != null) { - switch (state.Request.VideoCodec.Value) + switch (videoRequest.VideoCodec.Value) { case VideoCodecs.H264: return ".ts"; diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index 7849e60ab..d8ffa61fd 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -21,7 +21,8 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Videos/{Id}/stream.mpeg", "GET")] [Route("/Videos/{Id}/stream.avi", "GET")] [Route("/Videos/{Id}/stream", "GET")] - public class GetVideoStream : StreamRequest + [ServiceStack.ServiceHost.Api(Description = "Gets a video stream")] + public class GetVideoStream : VideoStreamRequest { } @@ -59,7 +60,7 @@ namespace MediaBrowser.Api.Playback.Progressive var probeSize = Kernel.Instance.FFMpegManager.GetProbeSizeArgument(video.VideoType, video.IsoType); // Get the output codec name - var videoCodec = GetVideoCodec(state.Request); + var videoCodec = GetVideoCodec(state.VideoRequest); var graphicalSubtitleParam = string.Empty; @@ -103,7 +104,7 @@ namespace MediaBrowser.Api.Playback.Progressive { var args = "-vcodec " + videoCodec; - var request = state.Request; + var request = state.VideoRequest; // If we're encoding video, add additional params if (!videoCodec.Equals("copy", StringComparison.OrdinalIgnoreCase)) @@ -186,7 +187,7 @@ namespace MediaBrowser.Api.Playback.Progressive /// <param name="request">The request.</param> /// <param name="videoCodec">The video codec.</param> /// <returns>System.String.</returns> - private string GetVideoQualityParam(StreamRequest request, string videoCodec) + private string GetVideoQualityParam(VideoStreamRequest request, string videoCodec) { var args = string.Empty; diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs index 52118c051..3ab13d9f6 100644 --- a/MediaBrowser.Api/Playback/StreamRequest.cs +++ b/MediaBrowser.Api/Playback/StreamRequest.cs @@ -1,4 +1,5 @@ using MediaBrowser.Model.Dto; +using ServiceStack.ServiceHost; namespace MediaBrowser.Api.Playback { @@ -11,27 +12,55 @@ namespace MediaBrowser.Api.Playback /// Gets or sets the id. /// </summary> /// <value>The id.</value> + [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Id { get; set; } /// <summary> /// Gets or sets the audio codec. /// </summary> /// <value>The audio codec.</value> + [ApiMember(Name = "AudioCodec", Description = "Optional. Specify a specific audio codec to encode to, e.g. mp3. If omitted the server will attempt to infer it using the url's extension. Options: aac, mp3, vorbis, wma.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] public AudioCodecs? AudioCodec { get; set; } /// <summary> /// Gets or sets the start time ticks. /// </summary> /// <value>The start time ticks.</value> + [ApiMember(Name = "StartTimeTicks", Description = "Optional. Specify a starting offset, in ticks. 1 tick = 10000 ms", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")] public long? StartTimeTicks { get; set; } /// <summary> /// Gets or sets the audio bit rate. /// </summary> /// <value>The audio bit rate.</value> + [ApiMember(Name = "AudioBitRate", Description = "Optional. Specify a specific audio bitrate to encode to, e.g. 128000", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")] public int? AudioBitRate { get; set; } /// <summary> + /// Gets or sets the audio channels. + /// </summary> + /// <value>The audio channels.</value> + [ApiMember(Name = "AudioChannels", Description = "Optional. Specify a specific number of audio channels to encode to, e.g. 2", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")] + public int? AudioChannels { get; set; } + + /// <summary> + /// Gets or sets the audio sample rate. + /// </summary> + /// <value>The audio sample rate.</value> + [ApiMember(Name = "AudioSampleRate", Description = "Optional. Specify a specific audio sample rate, e.g. 44100", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")] + public int? AudioSampleRate { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this <see cref="StreamRequest" /> is static. + /// </summary> + /// <value><c>true</c> if static; otherwise, <c>false</c>.</value> + [ApiMember(Name = "Static", Description = "Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + public bool Static { get; set; } + } + + public class VideoStreamRequest : StreamRequest + { + /// <summary> /// Gets or sets the video codec. /// </summary> /// <value>The video codec.</value> @@ -62,18 +91,6 @@ namespace MediaBrowser.Api.Playback public int? SubtitleStreamIndex { get; set; } /// <summary> - /// Gets or sets the audio channels. - /// </summary> - /// <value>The audio channels.</value> - public int? AudioChannels { get; set; } - - /// <summary> - /// Gets or sets the audio sample rate. - /// </summary> - /// <value>The audio sample rate.</value> - public int? AudioSampleRate { get; set; } - - /// <summary> /// Gets or sets the width. /// </summary> /// <value>The width.</value> @@ -102,11 +119,5 @@ namespace MediaBrowser.Api.Playback /// </summary> /// <value>The framerate.</value> public double? Framerate { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this <see cref="StreamRequest" /> is static. - /// </summary> - /// <value><c>true</c> if static; otherwise, <c>false</c>.</value> - public bool Static { get; set; } } } diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs index c806fbcde..653c4d57b 100644 --- a/MediaBrowser.Api/Playback/StreamState.cs +++ b/MediaBrowser.Api/Playback/StreamState.cs @@ -11,6 +11,11 @@ namespace MediaBrowser.Api.Playback public StreamRequest Request { get; set; } + public VideoStreamRequest VideoRequest + { + get { return (VideoStreamRequest) Request; } + } + /// <summary> /// Gets or sets the log file stream. /// </summary> |