alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 14:58:36 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' into keyframe_extraction_v1

Browse Source
This commit is contained in:
cvium
2021-09-25 20:52:09 +02:00
parent 3e5cb8e04e 17273a6075
commit 30f3be1da0
132 changed files with 323 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Dlna/IDlnaManager.cs
View File

@@ -74,6 +74,6 @@ namespace MediaBrowser.Controller.Dlna
/// </summary>
/// <param name="filename">The filename.</param>
/// <returns>DlnaIconResponse.</returns>
ImageStream GetIcon(string filename);
ImageStream? GetIcon(string filename);
}
}

2
MediaBrowser.Controller/Drawing/IImageProcessor.cs
View File

@@ -58,7 +58,7 @@ namespace MediaBrowser.Controller.Drawing
/// <returns>Guid.</returns>
string GetImageCacheTag(BaseItem item, ItemImageInfo image);
string GetImageCacheTag(BaseItem item, ChapterInfo info);
string GetImageCacheTag(BaseItem item, ChapterInfo chapter);
string? GetImageCacheTag(User user);

9
MediaBrowser.Controller/Drawing/ImageStream.cs
View File

@@ -8,11 +8,16 @@ namespace MediaBrowser.Controller.Drawing
{
public class ImageStream : IDisposable
{
public ImageStream(Stream stream)
{
Stream = stream;
}
/// <summary>
/// Gets or sets the stream.
/// Gets the stream.
/// </summary>
/// <value>The stream.</value>
public Stream? Stream { get; set; }
public Stream Stream { get; }
/// <summary>
/// Gets or sets the format.

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -32,7 +32,7 @@
</ItemGroup>
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>

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

@@ -541,7 +541,12 @@ namespace MediaBrowser.Controller.MediaEncoding
return MimeType;
}
return MimeTypes.GetMimeType(outputPath, enableStreamDefault);
if (enableStreamDefault)
{
return MimeTypes.GetMimeType(outputPath);
}
return MimeTypes.GetMimeType(outputPath, null);
}
public bool DeInterlace(string videoCodec, bool forceDeinterlaceIfSourceIsInterlaced)