Merge pull request #2511 from MediaBrowser/dev

Dev

Emby.Drawing.ImageMagick/ImageMagickEncoder.cs

@@ -44,7 +44,9 @@ namespace Emby.Drawing.ImageMagick
                     "cr2", 
                     "crw", 
                     "dng", 
-                    "nef", 
+
+                    // Remove until supported
+                    //"nef", 
                     "orf", 
                     "pef", 
                     "arw", 

Emby.Server.Implementations/Dto/DtoService.cs

@@ -491,7 +491,7 @@ namespace Emby.Server.Implementations.Dto
                 }
             }
 
-            if (!(item is LiveTvProgram))
+            if (!(item is LiveTvProgram) || fields.Contains(ItemFields.PlayAccess))
             {
                 dto.PlayAccess = item.GetPlayAccess(user);
             }

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -425,8 +425,7 @@ namespace Emby.Server.Implementations.Library
 
                 if (parent != null)
                 {
-                    await parent.ValidateChildren(new Progress<double>(), CancellationToken.None)
-                              .ConfigureAwait(false);
+                    await parent.ValidateChildren(new Progress<double>(), CancellationToken.None, new MetadataRefreshOptions(_fileSystem), false) .ConfigureAwait(false);
                 }
             }
             else if (parent != null)

Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 
 namespace Emby.Server.Implementations.LiveTv
@@ -16,6 +15,8 @@ namespace Emby.Server.Implementations.LiveTv
         private readonly IMediaEncoder _mediaEncoder;
         private readonly ILogger _logger;
 
+        const int AnalyzeDurationMs = 2000;
+
         public LiveStreamHelper(IMediaEncoder mediaEncoder, ILogger logger)
         {
             _mediaEncoder = mediaEncoder;
@@ -34,7 +35,7 @@ namespace Emby.Server.Implementations.LiveTv
                 Protocol = mediaSource.Protocol,
                 MediaType = isAudio ? DlnaProfileType.Audio : DlnaProfileType.Video,
                 ExtractChapters = false,
-                AnalyzeDurationSections = 2
+                AnalyzeDurationMs = AnalyzeDurationMs
 
             }, cancellationToken).ConfigureAwait(false);
 
@@ -98,6 +99,8 @@ namespace Emby.Server.Implementations.LiveTv
 
             // Try to estimate this
             mediaSource.InferTotalBitrate(true);
+
+            mediaSource.AnalyzeDurationMs = AnalyzeDurationMs;
         }
     }
 }

Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

@@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             using (var manager = new HdHomerunManager(_socketFactory))
             {
                 // Legacy HdHomeruns are IPv4 only
-                var ipInfo = new IpAddressInfo(uri.Host, IpAddressFamily.InterNetwork);
+                var ipInfo = _networkManager.ParseIpAddress(uri.Host);
 
                 for (int i = 0; i < model.TunerCount; ++i)
                 {

Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs

@@ -96,9 +96,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 {
                     using (var hdHomerunManager = new HdHomerunManager(_socketFactory))
                     {
-                        var remoteAddress = new IpAddressInfo(remoteIp, IpAddressFamily.InterNetwork);
+                        var remoteAddress = _networkManager.ParseIpAddress(remoteIp);
                         IpAddressInfo localAddress = null;
-                        using (var tcpSocket = _socketFactory.CreateSocket(IpAddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp, false))
+                        using (var tcpSocket = _socketFactory.CreateSocket(remoteAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp, false))
                         {
                             try
                             {

Emby.Server.Implementations/LiveTv/TunerHosts/MulticastStream.cs

@@ -40,7 +40,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
                     _sharedBuffer.Enqueue(copy);
 
-                    while (_sharedBuffer.Count > 3000)
+                    while (_sharedBuffer.Count > 10000)
                     {
                         byte[] bytes;
                         _sharedBuffer.TryDequeue(out bytes);

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -175,6 +175,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 return null;
             }
+            if (string.Equals(container, "rec", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
 
             return container;
         }
@@ -459,21 +463,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             return level;
         }
 
-        /// <summary>
-        /// Gets the probe size argument.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <returns>System.String.</returns>
-        public string GetProbeSizeArgument(EncodingJobInfo state)
-        {
-            if (state.PlayableStreamFileNames.Count > 0)
-            {
-                return _mediaEncoder.GetProbeSizeAndAnalyzeDurationArgument(state.PlayableStreamFileNames.ToArray(), state.InputProtocol);
-            }
-            
-            return _mediaEncoder.GetProbeSizeAndAnalyzeDurationArgument(new[] { state.MediaPath }, state.InputProtocol);
-        }
-
         /// <summary>
         /// Gets the text subtitle param.
         /// </summary>
@@ -1448,12 +1437,43 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
+        public static string GetProbeSizeArgument(int numInputFiles)
+        {
+            return numInputFiles > 1 ? "-probesize 1G" : "";
+        }
+
+        public static string GetAnalyzeDurationArgument(int numInputFiles)
+        {
+            return numInputFiles > 1 ? "-analyzeduration 200M" : "";
+        }
+
         public string GetInputModifier(EncodingJobInfo state, EncodingOptions encodingOptions)
         {
             var inputModifier = string.Empty;
 
-            var probeSize = GetProbeSizeArgument(state);
-            inputModifier += " " + probeSize;
+            var numInputFiles = state.PlayableStreamFileNames.Count > 0 ? state.PlayableStreamFileNames.Count : 1;
+            var probeSizeArgument = GetProbeSizeArgument(numInputFiles);
+
+            string analyzeDurationArgument;
+            if (state.MediaSource.AnalyzeDurationMs.HasValue)
+            {
+                analyzeDurationArgument = "-analyzeduration " + (state.MediaSource.AnalyzeDurationMs.Value * 1000).ToString(CultureInfo.InvariantCulture);
+            }
+            else
+            {
+                analyzeDurationArgument = GetAnalyzeDurationArgument(numInputFiles);
+            }
+
+            if (!string.IsNullOrWhiteSpace(probeSizeArgument))
+            {
+                inputModifier += " " + probeSizeArgument;
+            }
+
+            if (!string.IsNullOrWhiteSpace(analyzeDurationArgument))
+            {
+                inputModifier += " " + analyzeDurationArgument;
+            }
+
             inputModifier = inputModifier.Trim();
 
             var userAgentParam = GetUserAgentParam(state);

MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs

@@ -78,14 +78,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <returns>Task.</returns>
         Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Gets the probe size argument.
-        /// </summary>
-        /// <param name="inputFiles">The input files.</param>
-        /// <param name="protocol">The protocol.</param>
-        /// <returns>System.String.</returns>
-        string GetProbeSizeAndAnalyzeDurationArgument(string[] inputFiles, MediaProtocol protocol);
-
         /// <summary>
         /// Gets the input argument.
         /// </summary>

MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs

@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         public IIsoMount MountedIso { get; set; }
         public VideoType VideoType { get; set; }
         public List<string> PlayableStreamFileNames { get; set; }
-        public int AnalyzeDurationSections { get; set; }
+        public int AnalyzeDurationMs { get; set; }
 
         public MediaInfoRequest()
         {

MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs

@@ -177,7 +177,7 @@ namespace MediaBrowser.LocalMetadata.Images
                 "default"
             };
 
-            if (item is MusicAlbum || item is MusicArtist || item is PhotoAlbum)
+            if (item is MusicAlbum || item is MusicArtist || item is PhotoAlbum || item is Person)
             {
                 // these prefer folder
                 names.Insert(0, "poster");

MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -90,6 +90,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var required = new[]
             {
                 "h264_qsv",
+                "hevc_qsv",
                 "mpeg2_qsv",
                 "vc1_qsv"
             };
@@ -134,9 +135,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 "libvorbis",
                 "srt",
                 "h264_nvenc",
+                "hevc_nvenc",
                 "h264_qsv",
+                "hevc_qsv",
                 "h264_omx",
+                "hevc_omx",
                 "h264_vaapi",
+                "hevc_vaapi",
                 "ac3"
             };
 
@@ -205,4 +210,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
         }
     }
-}
+}

MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs

@@ -61,15 +61,5 @@ namespace MediaBrowser.MediaEncoding.Encoder
             // Quotes are valid path characters in linux and they need to be escaped here with a leading \
             return path.Replace("\"", "\\\"");
         }
-
-        public static string GetProbeSizeArgument(int numInputFiles)
-        {
-            return numInputFiles > 1 ? "-probesize 1G" : "";
-        }
-
-        public static string GetAnalyzeDurationArgument(int numInputFiles)
-        {
-            return numInputFiles > 1 ? "-analyzeduration 200M" : "";
-        }
     }
 }

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -523,17 +523,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             var inputFiles = MediaEncoderHelpers.GetInputArgument(FileSystem, request.InputPath, request.Protocol, request.MountedIso, request.PlayableStreamFileNames);
 
-            var probeSize = EncodingUtils.GetProbeSizeArgument(inputFiles.Length);
+            var probeSize = EncodingHelper.GetProbeSizeArgument(inputFiles.Length);
             string analyzeDuration;
 
-            if (request.AnalyzeDurationSections > 0)
+            if (request.AnalyzeDurationMs > 0)
             {
                 analyzeDuration = "-analyzeduration " +
-                                  (request.AnalyzeDurationSections * 1000000).ToString(CultureInfo.InvariantCulture);
+                                  (request.AnalyzeDurationMs * 1000).ToString(CultureInfo.InvariantCulture);
             }
             else
             {
-                analyzeDuration = EncodingUtils.GetAnalyzeDurationArgument(inputFiles.Length);
+                analyzeDuration = EncodingHelper.GetAnalyzeDurationArgument(inputFiles.Length);
             }
 
             probeSize = probeSize + " " + analyzeDuration;
@@ -557,31 +557,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return EncodingUtils.GetInputArgument(inputFiles.ToList(), protocol);
         }
 
-        /// <summary>
-        /// Gets the probe size argument.
-        /// </summary>
-        /// <param name="inputFiles">The input files.</param>
-        /// <param name="protocol">The protocol.</param>
-        /// <returns>System.String.</returns>
-        public string GetProbeSizeAndAnalyzeDurationArgument(string[] inputFiles, MediaProtocol protocol)
-        {
-            var results = new List<string>();
-
-            var probeSize = EncodingUtils.GetProbeSizeArgument(inputFiles.Length);
-            var analyzeDuration = EncodingUtils.GetAnalyzeDurationArgument(inputFiles.Length);
-
-            if (!string.IsNullOrWhiteSpace(probeSize))
-            {
-                results.Add(probeSize);
-            }
-
-            if (!string.IsNullOrWhiteSpace(analyzeDuration))
-            {
-                results.Add(analyzeDuration);
-            }
-            return string.Join(" ", results.ToArray());
-        }
-
         /// <summary>
         /// Gets the media info internal.
         /// </summary>
@@ -984,11 +959,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var args = useIFrame ? string.Format("-i {0}{3} -threads 0 -v quiet -vframes 1 -vf \"{2}{4}\" -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, thumbnail) :
                 string.Format("-i {0}{3} -threads 0 -v quiet -vframes 1 -vf \"{2}\" -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg);
 
-            var probeSize = GetProbeSizeAndAnalyzeDurationArgument(new[] { inputPath }, protocol);
+            var probeSizeArgument = EncodingHelper.GetProbeSizeArgument(1);
+            var analyzeDurationArgument = EncodingHelper.GetAnalyzeDurationArgument(1);
+
+            if (!string.IsNullOrWhiteSpace(probeSizeArgument))
+            {
+                args = probeSizeArgument + " " + args;
+            }
 
-            if (!string.IsNullOrEmpty(probeSize))
+            if (!string.IsNullOrWhiteSpace(analyzeDurationArgument))
             {
-                args = probeSize + " " + args;
+                args = analyzeDurationArgument + " " + args;
             }
 
             if (offset.HasValue)
@@ -1092,11 +1073,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             var args = string.Format("-i {0} -threads 0 -v quiet -vf \"{2}\" -f image2 \"{1}\"", inputArgument, outputPath, vf);
 
-            var probeSize = GetProbeSizeAndAnalyzeDurationArgument(new[] { inputArgument }, protocol);
+            var probeSizeArgument = EncodingHelper.GetProbeSizeArgument(1);
+            var analyzeDurationArgument = EncodingHelper.GetAnalyzeDurationArgument(1);
+
+            if (!string.IsNullOrWhiteSpace(probeSizeArgument))
+            {
+                args = probeSizeArgument + " " + args;
+            }
 
-            if (!string.IsNullOrEmpty(probeSize))
+            if (!string.IsNullOrWhiteSpace(analyzeDurationArgument))
             {
-                args = probeSize + " " + args;
+                args = analyzeDurationArgument + " " + args;
             }
 
             var process = _processFactory.Create(new ProcessOptions

MediaBrowser.Model/Dto/MediaSourceInfo.cs

@@ -60,6 +60,8 @@ namespace MediaBrowser.Model.Dto
         public string TranscodingSubProtocol { get; set; }
         public string TranscodingContainer { get; set; }
 
+        public int? AnalyzeDurationMs { get; set; }
+
         public MediaSourceInfo()
         {
             Formats = new List<string>();

MediaBrowser.Model/Querying/ItemFields.cs

@@ -151,6 +151,8 @@
         /// </summary>
         People,
 
+        PlayAccess,
+
         /// <summary>
         /// The production locations
         /// </summary>

MediaBrowser.Model/Session/PlaybackProgressInfo.cs

@@ -73,6 +73,10 @@ namespace MediaBrowser.Model.Session
         /// <value>The volume level.</value>
         public int? VolumeLevel { get; set; }
 
+        public int? Brightness { get; set; }
+
+        public string AspectRatio { get; set; }
+
         /// <summary>
         /// Gets or sets the play method.
         /// </summary>

MediaBrowser.Providers/Manager/ImageSaver.cs

@@ -410,6 +410,7 @@ namespace MediaBrowser.Providers.Manager
             var folderName = item is MusicAlbum ||
                 item is MusicArtist ||
                 item is PhotoAlbum ||
+                item is Person ||
                 (saveLocally && _config.Configuration.ImageSavingConvention == ImageSavingConvention.Legacy) ?
                 "folder" :
                 "poster";

SharedVersion.cs

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