diff options
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 130 |
1 files changed, 53 insertions, 77 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index a470bc2fa..93f3e2d9f 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1507,6 +1507,16 @@ namespace MediaBrowser.Api.Playback } } + var headers = new Dictionary<string, string>(); + foreach (var key in Request.Headers.AllKeys) + { + headers[key] = Request.Headers[key]; + } + + state.DeviceProfile = string.IsNullOrWhiteSpace(state.Request.DeviceProfileId) ? + DlnaManager.GetProfile(headers) : + DlnaManager.GetProfile(state.Request.DeviceProfileId); + return state; } @@ -1631,16 +1641,7 @@ namespace MediaBrowser.Api.Playback private void ApplyDeviceProfileSettings(StreamState state) { - var headers = new Dictionary<string, string>(); - - foreach (var key in Request.Headers.AllKeys) - { - headers[key] = Request.Headers[key]; - } - - var profile = string.IsNullOrWhiteSpace(state.Request.DeviceProfileId) ? - DlnaManager.GetProfile(headers) : - DlnaManager.GetProfile(state.Request.DeviceProfileId); + var profile = state.DeviceProfile; if (profile == null) { @@ -1664,13 +1665,12 @@ namespace MediaBrowser.Api.Playback } var mediaProfile = state.VideoRequest == null ? - profile.GetAudioMediaProfile(state.OutputContainer, audioCodec, state.AudioStream) : - profile.GetVideoMediaProfile(state.OutputContainer, audioCodec, videoCodec, state.AudioStream, state.VideoStream); + profile.GetAudioMediaProfile(state.OutputContainer, audioCodec) : + profile.GetVideoMediaProfile(state.OutputContainer, audioCodec, videoCodec); if (mediaProfile != null) { state.MimeType = mediaProfile.MimeType; - state.OrgPn = mediaProfile.OrgPn; } var transcodingProfile = state.VideoRequest == null ? @@ -1699,95 +1699,71 @@ namespace MediaBrowser.Api.Playback /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns> protected void AddDlnaHeaders(StreamState state, IDictionary<string, string> responseHeaders, bool isStaticallyStreamed) { + var profile = state.DeviceProfile; + + if (profile == null) + { + return; + } + var transferMode = GetHeader("transferMode.dlna.org"); responseHeaders["transferMode.dlna.org"] = string.IsNullOrEmpty(transferMode) ? "Streaming" : transferMode; responseHeaders["realTimeInfo.dlna.org"] = "DLNA.ORG_TLAG=*"; - // first bit means Time based seek supported, second byte range seek supported (not sure about the order now), so 01 = only byte seek, 10 = time based, 11 = both, 00 = none - var orgOp = ";DLNA.ORG_OP=" + DlnaMaps.GetOrgOpValue(state.RunTimeTicks.HasValue, isStaticallyStreamed, state.TranscodeSeekInfo); - if (state.RunTimeTicks.HasValue && !isStaticallyStreamed) { AddTimeSeekResponseHeaders(state, responseHeaders); } - // 0 = native, 1 = transcoded - var orgCi = isStaticallyStreamed ? ";DLNA.ORG_CI=0" : ";DLNA.ORG_CI=1"; - - var flagValue = DlnaFlags.StreamingTransferMode | - DlnaFlags.BackgroundTransferMode | - DlnaFlags.DlnaV15; - - if (isStaticallyStreamed) - { - //flagValue = flagValue | DlnaFlags.DLNA_ORG_FLAG_BYTE_BASED_SEEK; - } - else if (state.RunTimeTicks.HasValue) - { - //flagValue = flagValue | DlnaFlags.DLNA_ORG_FLAG_TIME_BASED_SEEK; - } - - var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}000000000000000000000000", - Enum.Format(typeof(DlnaFlags), flagValue, "x")); - - var orgPn = GetOrgPnValue(state); - - var contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : - "DLNA.ORG_PN=" + orgPn; - - if (!string.IsNullOrEmpty(contentFeatures)) - { - responseHeaders["contentFeatures.dlna.org"] = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';'); - } - - foreach (var item in responseHeaders) - { - Request.Response.AddHeader(item.Key, item.Value); - } - } - - private string GetOrgPnValue(StreamState state) - { - if (!string.IsNullOrWhiteSpace(state.OrgPn)) - { - return state.OrgPn; - } + var audioCodec = state.Request.AudioCodec; if (state.VideoRequest == null) { - var format = new MediaFormatProfileResolver() - .ResolveAudioFormat(state.OutputContainer, + responseHeaders["contentFeatures.dlna.org"] = new ContentFeatureBuilder(profile) + .BuildAudioHeader( + state.OutputContainer, + audioCodec, state.OutputAudioBitrate, state.OutputAudioSampleRate, - state.OutputAudioChannels); - - return format.HasValue ? format.Value.ToString() : null; + state.OutputAudioChannels, + isStaticallyStreamed, + state.RunTimeTicks, + state.TranscodeSeekInfo + ); } - - var audioCodec = state.Request.AudioCodec; - - if (string.Equals(audioCodec, "copy", StringComparison.OrdinalIgnoreCase) && state.AudioStream != null) + else { - audioCodec = state.AudioStream.Codec; - } + if (string.Equals(audioCodec, "copy", StringComparison.OrdinalIgnoreCase) && state.AudioStream != null) + { + audioCodec = state.AudioStream.Codec; + } - var videoCodec = state.VideoRequest == null ? null : state.VideoRequest.VideoCodec; + var videoCodec = state.VideoRequest == null ? null : state.VideoRequest.VideoCodec; - if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase) && state.VideoStream != null) - { - videoCodec = state.VideoStream.Codec; - } + if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase) && state.VideoStream != null) + { + videoCodec = state.VideoStream.Codec; + } - var videoFormat = new MediaFormatProfileResolver() - .ResolveVideoFormat(state.OutputContainer, + responseHeaders["contentFeatures.dlna.org"] = new ContentFeatureBuilder(profile) + .BuildVideoHeader( + state.OutputContainer, videoCodec, audioCodec, state.OutputWidth, state.OutputHeight, state.TotalOutputBitrate, - TransportStreamTimestamp.VALID); + TransportStreamTimestamp.VALID, + isStaticallyStreamed, + state.RunTimeTicks, + state.TranscodeSeekInfo + ); + } - return videoFormat.HasValue ? videoFormat.Value.ToString() : null; + foreach (var item in responseHeaders) + { + Request.Response.AddHeader(item.Key, item.Value); + } } private void AddTimeSeekResponseHeaders(StreamState state, IDictionary<string, string> responseHeaders) |