Merge pull request #2636 from MediaBrowser/dev

Dev

Emby.Drawing/ImageProcessor.cs

@@ -513,13 +513,16 @@ namespace Emby.Drawing
         /// <returns>ImageSize.</returns>
         private ImageSize GetImageSizeInternal(string path, bool allowSlowMethod)
         {
-            // Can't use taglib because it keeps a lock on the file
             //try
             //{
-            //    using (var file = TagLib.File.Create(new StreamFileAbstraction(Path.GetFileName(path), _fileSystem.OpenRead(path), null)))
+            //    using (var fileStream = _fileSystem.OpenRead(path))
+            //    {
+            //        using (var file = TagLib.File.Create(new StreamFileAbstraction(Path.GetFileName(path), fileStream, null)))
             //        {
             //            var image = file as TagLib.Image.File;
 
+            //            if (image != null)
+            //            {
             //                var properties = image.Properties;
 
             //                return new ImageSize
@@ -528,6 +531,8 @@ namespace Emby.Drawing
             //                    Width = properties.PhotoWidth
             //                };
             //            }
+            //        }
+            //    }
             //}
             //catch
             //{

Emby.Photos/PhotoProvider.cs

@@ -35,7 +35,9 @@ namespace Emby.Photos
 
             try
             {
-                using (var file = TagLib.File.Create(new StreamFileAbstraction(Path.GetFileName(item.Path), _fileSystem.OpenRead(item.Path), null)))
+                using (var fileStream = _fileSystem.OpenRead(item.Path))
+                {
+                    using (var file = TagLib.File.Create(new StreamFileAbstraction(Path.GetFileName(item.Path), fileStream, null)))
                     {
                         var image = file as TagLib.Image.File;
 
@@ -142,6 +144,7 @@ namespace Emby.Photos
                         }
                     }
                 }
+            }
             catch (Exception e)
             {
                 _logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path);

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -668,7 +668,7 @@ namespace Emby.Server.Implementations.Updates
             _logger.Info("Deleting plugin file {0}", path);
 
             // Make this case-insensitive to account for possible incorrect assembly naming
-            var file = _fileSystem.GetFilePaths(path)
+            var file = _fileSystem.GetFilePaths(_fileSystem.GetDirectoryName(path))
                 .FirstOrDefault(i => string.Equals(i, path, StringComparison.OrdinalIgnoreCase));
 
             if (!string.IsNullOrWhiteSpace(file))

MediaBrowser.Api/Playback/Hls/BaseHlsService.cs

@@ -234,11 +234,11 @@ namespace MediaBrowser.Api.Playback.Hls
 
             try
             {
-                return FileSystem.GetFileStream(tmpPath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.ReadWrite, true);
+                return FileSystem.GetFileStream(tmpPath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.ReadWrite, FileOpenOptions.Asynchronous | FileOpenOptions.SequentialScan);
             }
             catch (IOException)
             {
-                return FileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.ReadWrite, true);
+                return FileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.ReadWrite, FileOpenOptions.Asynchronous | FileOpenOptions.SequentialScan);
             }
         }
 

MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs

@@ -59,7 +59,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             get
             {
-                return false;
+                return MediaSource.GenPtsInput;
             }
         }
 
@@ -93,12 +93,14 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             get
             {
-                // For live tv + recordings
-                if (string.Equals(InputContainer, "mpegts", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(InputContainer, "ts", StringComparison.OrdinalIgnoreCase))
+                // For live tv + in progress recordings
+                if (string.Equals(InputContainer, "mpegts", StringComparison.OrdinalIgnoreCase) || string.Equals(InputContainer, "ts", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (!MediaSource.RunTimeTicks.HasValue)
                     {
                         return "cfr";
                     }
+                }
 
                 return "-1";
             }

MediaBrowser.Model/Dto/MediaSourceInfo.cs

@@ -31,6 +31,7 @@ namespace MediaBrowser.Model.Dto
         public bool ReadAtNativeFramerate { get; set; }
         public bool IgnoreDts { get; set; }
         public bool IgnoreIndex { get; set; }
+        public bool GenPtsInput { get; set; }
         public bool SupportsTranscoding { get; set; }
         public bool SupportsDirectStream { get; set; }
         public bool SupportsDirectPlay { get; set; }

SharedVersion.cs

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