diff options
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Api/Subtitles/SubtitleService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/Didl/DidlBuilder.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/PlayTo/PlayToController.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/ConditionProcessor.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/DeviceProfile.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 4 |
9 files changed, 4 insertions, 27 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index dc085dab94..db94e37f49 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -2033,8 +2033,6 @@ namespace MediaBrowser.Api.Playback profile.GetVideoMediaProfile(state.OutputContainer, audioCodec, videoCodec, - state.OutputAudioBitrate, - state.OutputAudioChannels, state.OutputWidth, state.OutputHeight, state.TargetVideoBitDepth, @@ -2121,8 +2119,6 @@ namespace MediaBrowser.Api.Playback state.OutputHeight, state.TargetVideoBitDepth, state.OutputVideoBitrate, - state.OutputAudioBitrate, - state.OutputAudioChannels, state.TargetTimestamp, isStaticallyStreamed, state.RunTimeTicks, diff --git a/MediaBrowser.Api/Subtitles/SubtitleService.cs b/MediaBrowser.Api/Subtitles/SubtitleService.cs index a70118d3ce..c9280b6f63 100644 --- a/MediaBrowser.Api/Subtitles/SubtitleService.cs +++ b/MediaBrowser.Api/Subtitles/SubtitleService.cs @@ -100,6 +100,7 @@ namespace MediaBrowser.Api.Subtitles } [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/subtitles.m3u8", "GET", Summary = "Gets an HLS subtitle playlist.")] + [Authenticated] public class GetSubtitlePlaylist { /// <summary> diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs index 52791822bb..08f7707355 100644 --- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs +++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs @@ -149,8 +149,6 @@ namespace MediaBrowser.Dlna.Didl targetHeight, streamInfo.TargetVideoBitDepth, streamInfo.TargetVideoBitrate, - streamInfo.TargetAudioChannels, - streamInfo.TargetAudioBitrate, streamInfo.TargetTimestamp, streamInfo.IsDirectStream, streamInfo.RunTimeTicks, @@ -276,11 +274,9 @@ namespace MediaBrowser.Dlna.Didl streamInfo.AudioCodec, streamInfo.VideoCodec, streamInfo.TargetAudioBitrate, - targetChannels, targetWidth, targetHeight, streamInfo.TargetVideoBitDepth, - streamInfo.TargetVideoBitrate, streamInfo.TargetVideoProfile, streamInfo.TargetVideoLevel, streamInfo.TargetFramerate, diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs index 7a1d547e32..5aa8c1f9ca 100644 --- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs +++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs @@ -509,8 +509,6 @@ namespace MediaBrowser.Dlna.PlayTo streamInfo.TargetHeight, streamInfo.TargetVideoBitDepth, streamInfo.TargetVideoBitrate, - streamInfo.TargetAudioChannels, - streamInfo.TargetAudioBitrate, streamInfo.TargetTimestamp, streamInfo.IsDirectStream, streamInfo.RunTimeTicks, diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs index ea3cc6d898..44b85a77df 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs @@ -716,8 +716,6 @@ namespace MediaBrowser.MediaEncoding.Encoder profile.GetVideoMediaProfile(outputContainer, audioCodec, videoCodec, - state.OutputAudioBitrate, - state.OutputAudioChannels, state.OutputWidth, state.OutputHeight, state.TargetVideoBitDepth, diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs index 3769634440..793036f403 100644 --- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs +++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs @@ -7,8 +7,6 @@ namespace MediaBrowser.Model.Dlna public class ConditionProcessor { public bool IsVideoConditionSatisfied(ProfileCondition condition, - int? audioBitrate, - int? audioChannels, int? width, int? height, int? bitDepth, @@ -44,10 +42,6 @@ namespace MediaBrowser.Model.Dlna return IsConditionSatisfied(condition, videoProfile); case ProfileConditionValue.PacketLength: return IsConditionSatisfied(condition, packetLength); - case ProfileConditionValue.AudioBitrate: - return IsConditionSatisfied(condition, audioBitrate); - case ProfileConditionValue.AudioChannels: - return IsConditionSatisfied(condition, audioChannels); case ProfileConditionValue.VideoBitDepth: return IsConditionSatisfied(condition, bitDepth); case ProfileConditionValue.VideoBitrate: diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs index 8161f1c268..3a798e3fe7 100644 --- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs +++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs @@ -105,8 +105,6 @@ namespace MediaBrowser.Model.Dlna int? height, int? bitDepth, int? videoBitrate, - int? audioChannels, - int? audioBitrate, TransportStreamTimestamp timestamp, bool isDirectStream, long? runtimeTicks, @@ -147,8 +145,6 @@ namespace MediaBrowser.Model.Dlna ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container, audioCodec, videoCodec, - audioBitrate, - audioChannels, width, height, bitDepth, diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs index 7297436a2e..a78724bf2d 100644 --- a/MediaBrowser.Model/Dlna/DeviceProfile.cs +++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs @@ -272,8 +272,6 @@ namespace MediaBrowser.Model.Dlna public ResponseProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, - int? audioBitrate, - int? audioChannels, int? width, int? height, int? bitDepth, @@ -321,7 +319,7 @@ namespace MediaBrowser.Model.Dlna var anyOff = false; foreach (ProfileCondition c in i.Conditions) { - if (!conditionProcessor.IsVideoConditionSatisfied(c, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams)) + if (!conditionProcessor.IsVideoConditionSatisfied(c, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams)) { anyOff = true; break; diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index cecd61e79d..715752d053 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -578,7 +578,7 @@ namespace MediaBrowser.Model.Dlna // Check container conditions foreach (ProfileCondition i in conditions) { - if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams)) + if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams)) { LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource); @@ -611,7 +611,7 @@ namespace MediaBrowser.Model.Dlna foreach (ProfileCondition i in conditions) { - if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams)) + if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams)) { LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource); |