diff options
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 75 |
1 files changed, 53 insertions, 22 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 2d27429b3..ef6c29550 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Dlna; using MediaBrowser.Controller.Dto; @@ -25,7 +26,6 @@ using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Model.MediaInfo; namespace MediaBrowser.Api.Playback { @@ -71,6 +71,7 @@ namespace MediaBrowser.Api.Playback protected IItemRepository ItemRepository { get; private set; } protected ILiveTvManager LiveTvManager { get; private set; } protected IDlnaManager DlnaManager { get; private set; } + protected IChannelManager ChannelManager { get; private set; } /// <summary> /// Initializes a new instance of the <see cref="BaseStreamingService" /> class. @@ -83,8 +84,9 @@ namespace MediaBrowser.Api.Playback /// <param name="dtoService">The dto service.</param> /// <param name="fileSystem">The file system.</param> /// <param name="itemRepository">The item repository.</param> - protected BaseStreamingService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IDtoService dtoService, IFileSystem fileSystem, IItemRepository itemRepository, ILiveTvManager liveTvManager, IEncodingManager encodingManager, IDlnaManager dlnaManager) + protected BaseStreamingService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IDtoService dtoService, IFileSystem fileSystem, IItemRepository itemRepository, ILiveTvManager liveTvManager, IEncodingManager encodingManager, IDlnaManager dlnaManager, IChannelManager channelManager) { + ChannelManager = channelManager; DlnaManager = dlnaManager; EncodingManager = encodingManager; LiveTvManager = liveTvManager; @@ -169,13 +171,28 @@ namespace MediaBrowser.Api.Playback /// <returns>System.String.</returns> protected virtual string GetMapArgs(StreamState state) { - var args = string.Empty; + // If we don't have known media info + // If input is video, use -sn to drop subtitles + // Otherwise just return empty + if (state.VideoStream == null && state.AudioStream == null) + { + return state.IsInputVideo ? "-sn" : string.Empty; + } + + // We have media info, but we don't know the stream indexes + if (state.VideoStream != null && state.VideoStream.Index == -1) + { + return "-sn"; + } - if (!state.HasMediaStreams) + // We have media info, but we don't know the stream indexes + if (state.AudioStream != null && state.AudioStream.Index == -1) { return state.IsInputVideo ? "-sn" : string.Empty; } + var args = string.Empty; + if (state.VideoStream != null) { args += string.Format("-map 0:{0}", state.VideoStream.Index); @@ -350,11 +367,11 @@ namespace MediaBrowser.Api.Playback switch (qualitySetting) { case EncodingQuality.HighSpeed: - crf = "16"; + crf = "14"; profileScore = 2; break; case EncodingQuality.HighQuality: - crf = "10"; + crf = "8"; profileScore = 1; break; case EncodingQuality.MaxQuality: @@ -1329,13 +1346,14 @@ namespace MediaBrowser.Api.Playback throw new ArgumentException(string.Format("{0} is not allowed to play media.", user.Name)); } + List<MediaStream> mediaStreams = null; + if (item is ILiveTvRecording) { var recording = await LiveTvManager.GetInternalRecording(request.Id, cancellationToken).ConfigureAwait(false); state.VideoType = VideoType.VideoFile; state.IsInputVideo = string.Equals(recording.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase); - state.PlayableStreamFileNames = new List<string>(); var path = recording.RecordingInfo.Path; var mediaUrl = recording.RecordingInfo.Url; @@ -1345,6 +1363,7 @@ namespace MediaBrowser.Api.Playback var streamInfo = await LiveTvManager.GetRecordingStream(request.Id, cancellationToken).ConfigureAwait(false); state.LiveTvStreamId = streamInfo.Id; + mediaStreams = streamInfo.MediaStreams; path = streamInfo.Path; mediaUrl = streamInfo.Url; @@ -1381,11 +1400,11 @@ namespace MediaBrowser.Api.Playback state.VideoType = VideoType.VideoFile; state.IsInputVideo = string.Equals(channel.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase); - state.PlayableStreamFileNames = new List<string>(); var streamInfo = await LiveTvManager.GetChannelStream(request.Id, cancellationToken).ConfigureAwait(false); state.LiveTvStreamId = streamInfo.Id; + mediaStreams = streamInfo.MediaStreams; if (!string.IsNullOrEmpty(streamInfo.Path)) { @@ -1406,6 +1425,16 @@ namespace MediaBrowser.Api.Playback state.InputVideoSync = "-1"; state.InputAudioSync = "1"; } + else if (item is IChannelMediaItem) + { + var channelMediaSources = await ChannelManager.GetChannelItemMediaSources(request.Id, CancellationToken.None).ConfigureAwait(false); + + var source = channelMediaSources.First(); + state.IsInputVideo = string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase); + state.IsRemote = source.IsRemote; + state.MediaPath = source.Path; + state.RunTimeTicks = item.RunTimeTicks; + } else { state.MediaPath = item.Path; @@ -1424,7 +1453,11 @@ namespace MediaBrowser.Api.Playback : video.PlayableStreamFileNames.ToList(); state.DeInterlace = string.Equals(video.Container, "wtv", StringComparison.OrdinalIgnoreCase); - state.InputTimestamp = video.Timestamp ?? TransportStreamTimestamp.None; + + if (video.Timestamp.HasValue) + { + state.InputTimestamp = video.Timestamp.Value; + } state.InputContainer = video.Container; } @@ -1440,7 +1473,7 @@ namespace MediaBrowser.Api.Playback var videoRequest = request as VideoStreamRequest; - var mediaStreams = ItemRepository.GetMediaStreams(new MediaStreamQuery + mediaStreams = mediaStreams ?? ItemRepository.GetMediaStreams(new MediaStreamQuery { ItemId = item.Id @@ -1469,8 +1502,6 @@ namespace MediaBrowser.Api.Playback state.AudioStream = GetMediaStream(mediaStreams, null, MediaStreamType.Audio, true); } - state.HasMediaStreams = mediaStreams.Count > 0; - state.SegmentLength = state.ReadInputAtNativeFramerate ? 5 : 10; state.HlsListSize = state.ReadInputAtNativeFramerate ? 100 : 1440; @@ -1504,16 +1535,6 @@ 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; } @@ -1638,6 +1659,16 @@ 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]; + } + + state.DeviceProfile = string.IsNullOrWhiteSpace(state.Request.DeviceProfileId) ? + DlnaManager.GetProfile(headers) : + DlnaManager.GetProfile(state.Request.DeviceProfileId); + var profile = state.DeviceProfile; if (profile == null) |