Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2636 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-05-14 15:31:23 -04:00 committed by GitHub
commit fcf588ac14
7 changed files with 110 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Drawing/ImageProcessor.cs
View File

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

5
Emby.Photos/PhotoProvider.cs
View File

@ -35,7 +35,9 @@ namespace Emby.Photos
try 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; var image = file as TagLib.Image.File;
@ -142,6 +144,7 @@ namespace Emby.Photos
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
_logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path); _logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path);

2
Emby.Server.Implementations/Updates/InstallationManager.cs
View File

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

4
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
View File

@ -234,11 +234,11 @@ namespace MediaBrowser.Api.Playback.Hls
try 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) 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);
} }
} }

10
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

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

1
MediaBrowser.Model/Dto/MediaSourceInfo.cs
View File

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

2
SharedVersion.cs
View File

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