Merge pull request #2729 from MediaBrowser/dev

Dev

Emby.Dlna/Didl/DidlBuilder.cs

@@ -472,6 +472,7 @@ namespace Emby.Dlna.Didl
             var targetAudioBitrate = streamInfo.TargetAudioBitrate;
             var targetSampleRate = streamInfo.TargetAudioSampleRate;
             var targetChannels = streamInfo.TargetAudioChannels;
+            var targetAudioBitDepth = streamInfo.TargetAudioBitDepth;
 
             if (targetChannels.HasValue)
             {
@@ -492,7 +493,8 @@ namespace Emby.Dlna.Didl
                 streamInfo.TargetAudioCodec,
                 targetChannels,
                 targetAudioBitrate,
-                targetSampleRate);
+                targetSampleRate,
+                targetAudioBitDepth);
 
             var filename = url.Substring(0, url.IndexOf('?'));
 
@@ -505,6 +507,7 @@ namespace Emby.Dlna.Didl
                 targetAudioBitrate,
                 targetSampleRate,
                 targetChannels,
+                targetAudioBitDepth,
                 streamInfo.IsDirectStream,
                 streamInfo.RunTimeTicks,
                 streamInfo.TranscodeSeekInfo);

Emby.Dlna/DlnaManager.cs

@@ -587,7 +587,8 @@ namespace Emby.Dlna
                 new DirectTvProfile(),
                 new DishHopperJoeyProfile(),
                 new DefaultProfile(),
-                new PopcornHourProfile()
+                new PopcornHourProfile(),
+                new MarantzProfile()
             };
 
             foreach (var item in list)

Emby.Dlna/Emby.Dlna.csproj

@@ -86,6 +86,7 @@
     <Compile Include="Profiles\Foobar2000Profile.cs" />
     <Compile Include="Profiles\LgTvProfile.cs" />
     <Compile Include="Profiles\LinksysDMA2100Profile.cs" />
+    <Compile Include="Profiles\MarantzProfile.cs" />
     <Compile Include="Profiles\MediaMonkeyProfile.cs" />
     <Compile Include="Profiles\PanasonicVieraProfile.cs" />
     <Compile Include="Profiles\PopcornHourProfile.cs" />
@@ -177,6 +178,9 @@
     <EmbeddedResource Include="Profiles\Xml\Xbox 360.xml" />
     <EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Emby.Dlna/PlayTo/PlayToController.cs

@@ -532,6 +532,7 @@ namespace Emby.Dlna.PlayTo
                     streamInfo.TargetAudioBitrate,
                     streamInfo.TargetAudioSampleRate,
                     streamInfo.TargetAudioChannels,
+                    streamInfo.TargetAudioBitDepth,
                     streamInfo.IsDirectStream,
                     streamInfo.RunTimeTicks,
                     streamInfo.TranscodeSeekInfo);

Emby.Dlna/Profiles/DenonAvrProfile.cs

@@ -10,6 +10,8 @@ namespace Emby.Dlna.Profiles
         {
             Name = "Denon AVR";
 
+            SupportedMediaTypes = "Audio";
+
             Identification = new DeviceIdentification
             {
                 FriendlyName = @"Denon:\[AVR:.*",

Emby.Dlna/Profiles/MarantzProfile.cs

@@ -0,0 +1,42 @@
+using System.Xml.Serialization;
+using MediaBrowser.Model.Dlna;
+
+namespace Emby.Dlna.Profiles
+{
+    [XmlRoot("Profile")]
+    public class MarantzProfile : DefaultProfile
+    {
+        public MarantzProfile()
+        {
+            Name = "Marantz";
+
+            SupportedMediaTypes = "Audio";
+
+            Identification = new DeviceIdentification
+            {
+                Manufacturer = @"Marantz",
+
+                Headers = new[]
+               {
+                   new HttpHeaderInfo
+                   {
+                       Name = "User-Agent",
+                       Value = "Marantz",
+                       Match = HeaderMatchType.Substring
+                   }
+               }
+            };
+
+            DirectPlayProfiles = new[]
+            {
+                new DirectPlayProfile
+                {
+                    Container = "aac,mp3,wav,wma,flac",
+                    Type = DlnaProfileType.Audio
+                },
+            };
+
+            ResponseProfiles = new ResponseProfile[] { };
+        }
+    }
+}

Emby.Dlna/Profiles/Xml/Denon AVR.xml

@@ -15,7 +15,7 @@
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <SupportedMediaTypes>Audio</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
   <MaxAlbumArtHeight>480</MaxAlbumArtHeight>

Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs

@@ -2,11 +2,14 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Controller.Persistence;
 
 namespace Emby.Server.Implementations.Library.Validators
@@ -78,6 +81,35 @@ namespace Emby.Server.Implementations.Library.Validators
                 progress.Report(percent);
             }
 
+            names = names.Select(i => i.RemoveDiacritics()).DistinctNames().ToList();
+
+            var artistEntities = _libraryManager.GetItemList(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(MusicArtist).Name }
+
+            }).Cast<MusicArtist>().ToList();
+
+            foreach (var artist in artistEntities)
+            {
+                if (!artist.IsAccessedByName)
+                {
+                    continue;
+                }
+
+                var name = (artist.Name ?? string.Empty).RemoveDiacritics();
+
+                if (!names.Contains(name, StringComparer.OrdinalIgnoreCase))
+                {
+                    _logger.Info("Deleting dead artist {0} {1}.", artist.Id.ToString("N"), artist.Name);
+
+                    await _libraryManager.DeleteItem(artist, new DeleteOptions
+                    {
+                        DeleteFileLocation = false
+
+                    }).ConfigureAwait(false);
+                }
+            }
+
             progress.Report(100);
         }
     }

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -869,7 +869,7 @@ namespace MediaBrowser.Api.Playback
             var videoCodec = state.ActualOutputVideoCodec;
 
             var mediaProfile = state.VideoRequest == null ?
-                profile.GetAudioMediaProfile(state.OutputContainer, audioCodec, state.OutputAudioChannels, state.OutputAudioBitrate, state.OutputAudioSampleRate) :
+                profile.GetAudioMediaProfile(state.OutputContainer, audioCodec, state.OutputAudioChannels, state.OutputAudioBitrate, state.OutputAudioSampleRate, state.OutputAudioBitDepth) :
                 profile.GetVideoMediaProfile(state.OutputContainer,
                 audioCodec,
                 videoCodec,
@@ -966,6 +966,7 @@ namespace MediaBrowser.Api.Playback
                     state.OutputAudioBitrate,
                     state.OutputAudioSampleRate,
                     state.OutputAudioChannels,
+                    state.OutputAudioBitDepth,
                     isStaticallyStreamed,
                     state.RunTimeTicks,
                     state.TranscodeSeekInfo

MediaBrowser.Api/Playback/UniversalAudioService.cs

@@ -52,6 +52,7 @@ namespace MediaBrowser.Api.Playback
         public string TranscodingContainer { get; set; }
         public string TranscodingProtocol { get; set; }
         public int? MaxAudioSampleRate { get; set; }
+        public int? MaxAudioBitDepth { get; set; }
 
         public bool EnableRedirection { get; set; }
         public bool EnableRemoteMedia { get; set; }
@@ -164,6 +165,18 @@ namespace MediaBrowser.Api.Playback
                 });
             }
 
+            if (request.MaxAudioBitDepth.HasValue)
+            {
+                // codec profile
+                conditions.Add(new ProfileCondition
+                {
+                    Condition = ProfileConditionType.LessThanEqual,
+                    IsRequired = false,
+                    Property = ProfileConditionValue.AudioBitDepth,
+                    Value = request.MaxAudioBitDepth.Value.ToString(CultureInfo.InvariantCulture)
+                });
+            }
+
             if (request.MaxAudioChannels.HasValue)
             {
                 // codec profile
@@ -266,6 +279,7 @@ namespace MediaBrowser.Api.Playback
                     Static = isStatic,
                     SegmentContainer = request.TranscodingContainer,
                     AudioSampleRate = request.MaxAudioSampleRate,
+                    MaxAudioBitDepth = request.MaxAudioBitDepth,
                     BreakOnNonKeyFrames = transcodingProfile.BreakOnNonKeyFrames,
                     TranscodeReasons = mediaSource.TranscodeReasons == null ? null : string.Join(",", mediaSource.TranscodeReasons.Select(i => i.ToString()).ToArray())
                 };
@@ -310,6 +324,7 @@ namespace MediaBrowser.Api.Playback
                     StartTimeTicks = request.StartTimeTicks,
                     Static = isStatic,
                     AudioSampleRate = request.MaxAudioSampleRate,
+                    MaxAudioBitDepth = request.MaxAudioBitDepth,
                     TranscodeReasons = mediaSource.TranscodeReasons == null ? null : string.Join(",", mediaSource.TranscodeReasons.Select(i => i.ToString()).ToArray())
                 };
 

MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs

@@ -284,6 +284,29 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
+        public int? OutputAudioBitDepth
+        {
+            get
+            {
+                if (BaseRequest.Static || string.Equals(OutputAudioCodec, "copy", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (AudioStream != null)
+                    {
+                        return AudioStream.BitDepth;
+                    }
+                }
+
+                //else if (BaseRequest.AudioSampleRate.HasValue)
+                //{
+                //    // Don't exceed what the encoder supports
+                //    // Seeing issues of attempting to encode to 88200
+                //    return Math.Min(44100, BaseRequest.AudioSampleRate.Value);
+                //}
+
+                return null;
+            }
+        }
+
         /// <summary>
         /// Predicts the audio sample rate that will be in the output stream
         /// </summary>

MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs

@@ -83,6 +83,8 @@ namespace MediaBrowser.Controller.MediaEncoding
         [ApiMember(Name = "AudioSampleRate", Description = "Optional. Specify a specific audio sample rate, e.g. 44100", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
         public int? AudioSampleRate { get; set; }
 
+        public int? MaxAudioBitDepth { get; set; }
+
         /// <summary>
         /// Gets or sets the audio bit rate.
         /// </summary>

MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs

@@ -262,7 +262,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var outputContainer = state.Options.OutputContainer;
 
             var mediaProfile = state.IsVideoRequest ?
-                profile.GetAudioMediaProfile(outputContainer, audioCodec, state.OutputAudioChannels, state.OutputAudioBitrate, state.OutputAudioSampleRate) :
+                profile.GetAudioMediaProfile(outputContainer, audioCodec, state.OutputAudioChannels, state.OutputAudioBitrate, state.OutputAudioSampleRate, state.OutputAudioBitDepth) :
                 profile.GetVideoMediaProfile(outputContainer,
                 audioCodec,
                 videoCodec,

MediaBrowser.Model/Dlna/ConditionProcessor.cs

@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Dlna
         public bool IsVideoConditionSatisfied(ProfileCondition condition,
             int? width,
             int? height,
-            int? bitDepth,
+            int? videoBitDepth,
             int? videoBitrate,
             string videoProfile,
             double? videoLevel,
@@ -46,7 +46,7 @@ namespace MediaBrowser.Model.Dlna
                 case ProfileConditionValue.PacketLength:
                     return IsConditionSatisfied(condition, packetLength);
                 case ProfileConditionValue.VideoBitDepth:
-                    return IsConditionSatisfied(condition, bitDepth);
+                    return IsConditionSatisfied(condition, videoBitDepth);
                 case ProfileConditionValue.VideoBitrate:
                     return IsConditionSatisfied(condition, videoBitrate);
                 case ProfileConditionValue.Height:
@@ -79,7 +79,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public bool IsAudioConditionSatisfied(ProfileCondition condition, int? audioChannels, int? audioBitrate, int? audioSampleRate)
+        public bool IsAudioConditionSatisfied(ProfileCondition condition, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
         {
             switch (condition.Property)
             {
@@ -89,6 +89,8 @@ namespace MediaBrowser.Model.Dlna
                     return IsConditionSatisfied(condition, audioChannels);
                 case ProfileConditionValue.AudioSampleRate:
                     return IsConditionSatisfied(condition, audioSampleRate);
+                case ProfileConditionValue.AudioBitDepth:
+                    return IsConditionSatisfied(condition, audioBitDepth);
                 default:
                     throw new ArgumentException("Unexpected condition on audio file: " + condition.Property);
             }
@@ -98,6 +100,7 @@ namespace MediaBrowser.Model.Dlna
             int? audioChannels,
             int? audioBitrate,
             int? audioSampleRate, 
+            int? audioBitDepth,
             string audioProfile,
             bool? isSecondaryTrack)
         {
@@ -113,6 +116,8 @@ namespace MediaBrowser.Model.Dlna
                     return IsConditionSatisfied(condition, isSecondaryTrack);
                 case ProfileConditionValue.AudioSampleRate:
                     return IsConditionSatisfied(condition, audioSampleRate);
+                case ProfileConditionValue.AudioBitDepth:
+                    return IsConditionSatisfied(condition, audioBitDepth);
                 default:
                     throw new ArgumentException("Unexpected condition on audio file: " + condition.Property);
             }

MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs

@@ -55,6 +55,7 @@ namespace MediaBrowser.Model.Dlna
             int? audioBitrate,
             int? audioSampleRate,
             int? audioChannels,
+            int? audioBitDepth,
             bool isDirectStream,
             long? runtimeTicks,
             TranscodeSeekInfo transcodeSeekInfo)
@@ -86,7 +87,8 @@ namespace MediaBrowser.Model.Dlna
                 audioCodec,
                 audioChannels,
                 audioBitrate,
-                audioSampleRate);
+                audioSampleRate,
+                audioBitDepth);
 
             string orgPn = mediaProfile == null ? null : mediaProfile.OrgPn;
 

MediaBrowser.Model/Dlna/DeviceProfile.cs

@@ -185,7 +185,7 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
-        public ResponseProfile GetAudioMediaProfile(string container, string audioCodec, int? audioChannels, int? audioBitrate, int? audioSampleRate)
+        public ResponseProfile GetAudioMediaProfile(string container, string audioCodec, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
         {
             container = StringHelper.TrimStart(container ?? string.Empty, '.');
 
@@ -213,7 +213,7 @@ namespace MediaBrowser.Model.Dlna
                 var anyOff = false;
                 foreach (ProfileCondition c in i.Conditions)
                 {
-                    if (!conditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate))
+                    if (!conditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate, audioBitDepth))
                     {
                         anyOff = true;
                         break;

MediaBrowser.Model/Dlna/ProfileConditionValue.cs

@@ -23,6 +23,7 @@
         VideoCodecTag = 19,
         IsAvc = 20,
         IsInterlaced = 21,
-        AudioSampleRate = 22
+        AudioSampleRate = 22,
+        AudioBitDepth = 23
     }
 }

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -167,6 +167,9 @@ namespace MediaBrowser.Model.Dlna
                 case ProfileConditionValue.VideoBitDepth:
                     return TranscodeReason.VideoBitDepthNotSupported;
 
+                case ProfileConditionValue.AudioBitDepth:
+                    return TranscodeReason.AudioBitDepthNotSupported;
+
                 case ProfileConditionValue.VideoBitrate:
                     return TranscodeReason.VideoBitrateNotSupported;
 
@@ -234,6 +237,7 @@ namespace MediaBrowser.Model.Dlna
             int? inputAudioChannels = audioStream == null ? null : audioStream.Channels;
             int? inputAudioBitrate = audioStream == null ? null : audioStream.BitDepth;
             int? inputAudioSampleRate = audioStream == null ? null : audioStream.SampleRate;
+            int? inputAudioBitDepth = audioStream == null ? null : audioStream.BitDepth;
 
             if (directPlayMethods.Count > 0)
             {
@@ -250,7 +254,7 @@ namespace MediaBrowser.Model.Dlna
                             bool applyConditions = true;
                             foreach (ProfileCondition applyCondition in i.ApplyConditions)
                             {
-                                if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate))
+                                if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                                 {
                                     LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
                                     applyConditions = false;
@@ -271,7 +275,7 @@ namespace MediaBrowser.Model.Dlna
                     bool all = true;
                     foreach (ProfileCondition c in conditions)
                     {
-                        if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate))
+                        if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                         {
                             LogConditionFailure(options.Profile, "AudioCodecProfile", c, item);
                             var transcodeReason = GetTranscodeReasonForFailedCondition(c);
@@ -351,7 +355,7 @@ namespace MediaBrowser.Model.Dlna
                     bool applyConditions = true;
                     foreach (ProfileCondition applyCondition in i.ApplyConditions)
                     {
-                        if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate))
+                        if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                         {
                             LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
                             applyConditions = false;
@@ -734,8 +738,9 @@ namespace MediaBrowser.Model.Dlna
                             int? audioChannels = audioStream == null ? null : audioStream.Channels;
                             string audioProfile = audioStream == null ? null : audioStream.Profile;
                             int? inputAudioSampleRate = audioStream == null ? null : audioStream.SampleRate;
+                            int? inputAudioBitDepth = audioStream == null ? null : audioStream.BitDepth;
 
-                            if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, inputAudioSampleRate, audioProfile, isSecondaryAudio))
+                            if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth, audioProfile, isSecondaryAudio))
                             {
                                 LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
                                 applyConditions = false;
@@ -972,6 +977,7 @@ namespace MediaBrowser.Model.Dlna
             int? audioChannels = audioStream == null ? null : audioStream.Channels;
             string audioProfile = audioStream == null ? null : audioStream.Profile;
             int? audioSampleRate = audioStream == null ? null : audioStream.SampleRate;
+            int? audioBitDepth = audioStream == null ? null : audioStream.BitDepth;
 
             TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
             int? packetLength = videoStream == null ? null : videoStream.PacketLength;
@@ -1066,7 +1072,7 @@ namespace MediaBrowser.Model.Dlna
                         bool applyConditions = true;
                         foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
-                            if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioProfile, isSecondaryAudio))
+                            if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                             {
                                 LogConditionFailure(profile, "VideoAudioCodecProfile", applyCondition, mediaSource);
                                 applyConditions = false;
@@ -1086,7 +1092,7 @@ namespace MediaBrowser.Model.Dlna
 
                 foreach (ProfileCondition i in conditions)
                 {
-                    if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioProfile, isSecondaryAudio))
+                    if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                     {
                         LogConditionFailure(profile, "VideoAudioCodecProfile", i, mediaSource);
 

MediaBrowser.Model/Dlna/StreamInfo.cs

@@ -477,6 +477,18 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
+        /// <summary>
+        /// Predicts the audio sample rate that will be in the output stream
+        /// </summary>
+        public int? TargetAudioBitDepth
+        {
+            get
+            {
+                MediaStream stream = TargetAudioStream;
+                return stream == null ? null : stream.BitDepth;
+            }
+        }
+
         /// <summary>
         /// Predicts the audio sample rate that will be in the output stream
         /// </summary>

MediaBrowser.Model/Session/TranscodingInfo.cs

@@ -47,6 +47,7 @@ namespace MediaBrowser.Model.Session
         VideoBitrateNotSupported = 16,
         VideoFramerateNotSupported = 17,
         VideoLevelNotSupported = 18,
-        VideoProfileNotSupported = 19
+        VideoProfileNotSupported = 19,
+        AudioBitDepthNotSupported = 20
     }
 }

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.20.13")]
+[assembly: AssemblyVersion("3.2.20.14")]