diff options
| -rw-r--r-- | MediaBrowser.Api/MediaBrowser.Api.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/StreamRequest.cs | 39 | ||||
| -rw-r--r-- | MediaBrowser.Common.Implementations/HttpServer/HttpServer.cs | 18 |
3 files changed, 51 insertions, 7 deletions
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index b8dcdfef2..51f177361 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -84,6 +84,7 @@ <Compile Include="Library\LibraryStructureService.cs" /> <Compile Include="LocalizationService.cs" /> <Compile Include="PackageService.cs" /> + <Compile Include="Playback\StreamRequest.cs" /> <Compile Include="PluginService.cs" /> <Compile Include="ScheduledTasks\ScheduledTaskService.cs" /> <Compile Include="ScheduledTasks\ScheduledTasksWebSocketListener.cs" /> diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs new file mode 100644 index 000000000..4847550e8 --- /dev/null +++ b/MediaBrowser.Api/Playback/StreamRequest.cs @@ -0,0 +1,39 @@ +using MediaBrowser.Model.Dto; + +namespace MediaBrowser.Api.Playback +{ + public class StreamRequest + { + public string Id { get; set; } + + public AudioCodecs? AudioCodec { get; set; } + + public long? StartTimeTicks { get; set; } + + public int? AudioBitRate { get; set; } + + public VideoCodecs? VideoCodec { get; set; } + + public int? VideoBitRate { get; set; } + + public int? AudioStreamIndex { get; set; } + + public int? VideoStreamIndex { get; set; } + + public int? SubtitleStreamIndex { get; set; } + + public int? AudioChannels { get; set; } + + public int? AudioSampleRate { get; set; } + + public int? Width { get; set; } + + public int? Height { get; set; } + + public int? MaxWidth { get; set; } + + public int? MaxHeight { get; set; } + + public double? Framerate { get; set; } + } +} diff --git a/MediaBrowser.Common.Implementations/HttpServer/HttpServer.cs b/MediaBrowser.Common.Implementations/HttpServer/HttpServer.cs index 57ba6163b..be10a9706 100644 --- a/MediaBrowser.Common.Implementations/HttpServer/HttpServer.cs +++ b/MediaBrowser.Common.Implementations/HttpServer/HttpServer.cs @@ -386,6 +386,8 @@ namespace MediaBrowser.Common.Implementations.HttpServer var httpRes = new HttpListenerResponseWrapper(context.Response); var handler = ServiceStackHttpHandlerFactory.GetHandler(httpReq); + var endPoint = context.Request.RemoteEndPoint; + var serviceStackHandler = handler as IServiceStackHttpHandler; if (serviceStackHandler != null) @@ -396,7 +398,7 @@ namespace MediaBrowser.Common.Implementations.HttpServer httpReq.OperationName = operationName = restHandler.RestPath.RequestType.Name; } serviceStackHandler.ProcessRequest(httpReq, httpRes, operationName); - LogResponse(context); + LogResponse(context, endPoint); httpRes.Close(); return; } @@ -408,8 +410,13 @@ namespace MediaBrowser.Common.Implementations.HttpServer /// Logs the response. /// </summary> /// <param name="ctx">The CTX.</param> - private void LogResponse(HttpListenerContext ctx) + private void LogResponse(HttpListenerContext ctx, IPEndPoint endPoint) { + if (!EnableHttpRequestLogging) + { + return; + } + var statusode = ctx.Response.StatusCode; var log = new StringBuilder(); @@ -418,12 +425,9 @@ namespace MediaBrowser.Common.Implementations.HttpServer log.AppendLine("Headers: " + string.Join(",", ctx.Response.Headers.AllKeys.Select(k => k + "=" + ctx.Response.Headers[k]))); - var msg = "Http Response Sent (" + statusode + ") to " + ctx.Request.RemoteEndPoint; + var msg = "Http Response Sent (" + statusode + ") to " + endPoint; - if (EnableHttpRequestLogging) - { - _logger.LogMultiline(msg, LogSeverity.Debug, log); - } + _logger.LogMultiline(msg, LogSeverity.Debug, log); } /// <summary> |