diff options
| author | Cody Robibero <cody@robibe.ro> | 2022-03-25 13:33:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 13:33:20 -0600 |
| commit | e6014bb8d380dc89fd04c242848ae9e8b2708bfa (patch) | |
| tree | 54027a0c52e36c7937ef63dcbdfebb9507fdaee7 | |
| parent | 8056b0e961a9e840ab13340f48816fa1194ad9cf (diff) | |
| parent | 4e91c3ebdc24e983c36089d73aac31c75d5012bc (diff) | |
Merge pull request #7493 from Shadowghost/dlna-fix
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamInfo.cs | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 93b0a454c..8671e5cbb 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -664,7 +664,7 @@ namespace MediaBrowser.Model.Dlna } } - _logger.LogInformation( + _logger.LogDebug( "DirectPlay Result for Profile: {0}, Path: {1}, PlayMethod: {2}, AudioStreamIndex: {3}, SubtitleStreamIndex: {4}, Reasons: {5}", options.Profile.Name ?? "Anonymous Profile", item.Path ?? "Unknown path", @@ -796,7 +796,7 @@ namespace MediaBrowser.Model.Dlna playlistItem.SetOption(qualifier, "level", videoStream.Level.ToString()); } - // prefer matching audio codecs, could do beter here + // prefer matching audio codecs, could do better here var audioCodecs = ContainerProfile.SplitValue(audioCodec); var directAudioStream = candidateAudioStreams.FirstOrDefault(stream => ContainerProfile.ContainsContainer(audioCodecs, stream.Codec)); playlistItem.AudioCodecs = audioCodecs; @@ -908,7 +908,7 @@ namespace MediaBrowser.Model.Dlna playlistItem.VideoBitrate = Math.Max(Math.Min(availableBitrateForVideo, currentValue), 64_000); } - _logger.LogInformation( + _logger.LogDebug( "Transcode Result for Profile: {Profile}, Path: {Path}, PlayMethod: {PlayMethod}, AudioStreamIndex: {AudioStreamIndex}, SubtitleStreamIndex: {SubtitleStreamIndex}, Reasons: {TranscodeReason}", options.Profile?.Name ?? "Anonymous Profile", item.Path ?? "Unknown path", diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index 79dfff5c2..da089602f 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -598,11 +598,6 @@ namespace MediaBrowser.Model.Dlna public string ToUrl(string baseUrl, string accessToken) { - if (PlayMethod == PlayMethod.DirectPlay) - { - return MediaSource.Path; - } - if (string.IsNullOrEmpty(baseUrl)) { throw new ArgumentNullException(nameof(baseUrl)); |