aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/Dlna/DlnaServerService.cs89
-rw-r--r--MediaBrowser.Api/Dlna/DlnaService.cs (renamed from MediaBrowser.Api/DlnaService.cs)2
-rw-r--r--MediaBrowser.Api/MediaBrowser.Api.csproj3
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs20
-rw-r--r--MediaBrowser.Api/Playback/StreamState.cs3
5 files changed, 108 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Dlna/DlnaServerService.cs b/MediaBrowser.Api/Dlna/DlnaServerService.cs
new file mode 100644
index 0000000000..922c67aa2d
--- /dev/null
+++ b/MediaBrowser.Api/Dlna/DlnaServerService.cs
@@ -0,0 +1,89 @@
+using MediaBrowser.Controller.Dlna;
+using ServiceStack;
+using ServiceStack.Web;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.Dlna
+{
+ [Route("/Dlna/{UuId}/description.xml", "GET", Summary = "Gets dlna server info")]
+ [Route("/Dlna/{UuId}/description", "GET", Summary = "Gets dlna server info")]
+ public class GetDescriptionXml
+ {
+ [ApiMember(Name = "UuId", Description = "Server UuId", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string UuId { get; set; }
+ }
+
+ [Route("/Dlna/{UuId}/contentdirectory.xml", "GET", Summary = "Gets dlna content directory xml")]
+ [Route("/Dlna/{UuId}/contentdirectory", "GET", Summary = "Gets the content directory xml")]
+ public class GetContentDirectory
+ {
+ [ApiMember(Name = "UuId", Description = "Server UuId", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string UuId { get; set; }
+ }
+
+ [Route("/Dlna/{UuId}/control", "POST", Summary = "Processes a control request")]
+ public class ProcessControlRequest : IRequiresRequestStream
+ {
+ [ApiMember(Name = "UuId", Description = "Server UuId", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string UuId { get; set; }
+
+ public Stream RequestStream { get; set; }
+ }
+
+ public class DlnaServerService : BaseApiService
+ {
+ private readonly IDlnaManager _dlnaManager;
+
+ public DlnaServerService(IDlnaManager dlnaManager)
+ {
+ _dlnaManager = dlnaManager;
+ }
+
+ public object Get(GetDescriptionXml request)
+ {
+ var xml = _dlnaManager.GetServerDescriptionXml(GetRequestHeaders(), request.UuId);
+
+ return ResultFactory.GetResult(xml, "text/xml");
+ }
+
+ public object Get(GetContentDirectory request)
+ {
+ var xml = _dlnaManager.GetContentDirectoryXml(GetRequestHeaders());
+
+ return ResultFactory.GetResult(xml, "text/xml");
+ }
+
+ public object Post(ProcessControlRequest request)
+ {
+ var response = PostAsync(request).Result;
+
+ return ResultFactory.GetResult(response.Xml, "text/xml");
+ }
+
+ private async Task<ControlResponse> PostAsync(ProcessControlRequest request)
+ {
+ using (var reader = new StreamReader(request.RequestStream))
+ {
+ return _dlnaManager.ProcessControlRequest(new ControlRequest
+ {
+ Headers = GetRequestHeaders(),
+ InputXml = await reader.ReadToEndAsync().ConfigureAwait(false)
+ });
+ }
+ }
+
+ private IDictionary<string, string> GetRequestHeaders()
+ {
+ var headers = new Dictionary<string, string>();
+
+ foreach (var key in Request.Headers.AllKeys)
+ {
+ headers[key] = Request.Headers[key];
+ }
+
+ return headers;
+ }
+ }
+}
diff --git a/MediaBrowser.Api/DlnaService.cs b/MediaBrowser.Api/Dlna/DlnaService.cs
index 792a7ff43f..9e6ca3aea9 100644
--- a/MediaBrowser.Api/DlnaService.cs
+++ b/MediaBrowser.Api/Dlna/DlnaService.cs
@@ -4,7 +4,7 @@ using ServiceStack;
using System.Collections.Generic;
using System.Linq;
-namespace MediaBrowser.Api
+namespace MediaBrowser.Api.Dlna
{
[Route("/Dlna/ProfileInfos", "GET", Summary = "Gets a list of profiles")]
public class GetProfileInfos : IReturn<List<DeviceProfileInfo>>
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index c03eddf99e..edbae3903e 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -66,7 +66,8 @@
<Link>Properties\SharedVersion.cs</Link>
</Compile>
<Compile Include="ChannelService.cs" />
- <Compile Include="DlnaService.cs" />
+ <Compile Include="Dlna\DlnaServerService.cs" />
+ <Compile Include="Dlna\DlnaService.cs" />
<Compile Include="Movies\CollectionService.cs" />
<Compile Include="Music\AlbumsService.cs" />
<Compile Include="AppThemeService.cs" />
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index bb55b893a2..4b0406cde8 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1341,6 +1341,12 @@ namespace MediaBrowser.Api.Playback
RequestedUrl = url
};
+ if (!string.IsNullOrWhiteSpace(request.AudioCodec))
+ {
+ state.SupportedAudioCodecs = request.AudioCodec.Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+ state.Request.AudioCodec = state.SupportedAudioCodecs.FirstOrDefault();
+ }
+
var item = string.IsNullOrEmpty(request.MediaSourceId) ?
DtoService.GetItemByDtoId(request.Id) :
DtoService.GetItemByDtoId(request.MediaSourceId);
@@ -1492,10 +1498,10 @@ namespace MediaBrowser.Api.Playback
videoRequest.VideoCodec = "copy";
}
- //if (state.AudioStream != null && CanStreamCopyAudio(request, state.AudioStream))
- //{
- // request.AudioCodec = "copy";
- //}
+ if (state.AudioStream != null && CanStreamCopyAudio(request, state.AudioStream, state.SupportedAudioCodecs))
+ {
+ request.AudioCodec = "copy";
+ }
}
return state;
@@ -1587,10 +1593,10 @@ namespace MediaBrowser.Api.Playback
return SupportsAutomaticVideoStreamCopy;
}
- private bool CanStreamCopyAudio(StreamRequest request, MediaStream audioStream)
+ private bool CanStreamCopyAudio(StreamRequest request, MediaStream audioStream, List<string> supportedAudioCodecs)
{
// Source and target codecs must match
- if (string.IsNullOrEmpty(request.AudioCodec) || !string.Equals(request.AudioCodec, audioStream.Codec, StringComparison.OrdinalIgnoreCase))
+ if (string.IsNullOrEmpty(audioStream.Codec) || !supportedAudioCodecs.Contains(audioStream.Codec, StringComparer.OrdinalIgnoreCase))
{
return false;
}
@@ -1623,7 +1629,7 @@ namespace MediaBrowser.Api.Playback
}
}
- return SupportsAutomaticVideoStreamCopy;
+ return true;
}
protected virtual bool SupportsAutomaticVideoStreamCopy
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index ce7d79917a..e41f296638 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -67,10 +67,13 @@ namespace MediaBrowser.Api.Playback
public string AudioSync = "1";
public string VideoSync = "vfr";
+ public List<string> SupportedAudioCodecs { get; set; }
+
public StreamState(ILiveTvManager liveTvManager, ILogger logger)
{
_liveTvManager = liveTvManager;
_logger = logger;
+ SupportedAudioCodecs = new List<string>();
}
public string InputAudioSync { get; set; }
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-03 12:09:59 +0000