CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-08 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add support for non-jpg image extractions

Browse source
This commit is contained in:
Joe Rogers 2021-10-07 22:37:59 +02:00
parent 6ce8cce12c
commit 8d70cc2dde
No known key found for this signature in database
GPG key ID: 0074AD57B8FDBBB4
4 changed files with 62 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View file

@ -582,7 +582,8 @@ namespace MediaBrowser.MediaEncoding.Probing
/// <returns>MediaAttachments.</returns>
private MediaAttachment GetMediaAttachment(MediaStreamInfo streamInfo)
{
if (!string.Equals(streamInfo.CodecType, "attachment", StringComparison.OrdinalIgnoreCase))
if (!string.Equals(streamInfo.CodecType, "attachment", StringComparison.OrdinalIgnoreCase) &&
!(streamInfo.Disposition != null && streamInfo.Disposition.GetValueOrDefault("attached_pic") == 1))
{
return null;
}
@ -735,15 +736,14 @@ namespace MediaBrowser.MediaEncoding.Probing
else if (string.Equals(stream.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
{
// How to differentiate between video and embedded image?
// check disposition, alternately: presence of codec tag, also embedded images have high (unusual) framerates
if ((streamInfo.Disposition != null && streamInfo.Disposition.GetValueOrDefault("attached_pic") == 1) ||
string.IsNullOrWhiteSpace(stream.CodecTag))
// The only difference I've seen thus far is presence of codec tag, also embedded images have high (unusual) framerates
if (!string.IsNullOrWhiteSpace(stream.CodecTag))
{
stream.Type = MediaStreamType.EmbeddedImage;
stream.Type = MediaStreamType.Video;
}
else
{
stream.Type = MediaStreamType.Video;
stream.Type = MediaStreamType.EmbeddedImage;
}
}
else
@ -812,12 +812,6 @@ namespace MediaBrowser.MediaEncoding.Probing
{
stream.ColorPrimaries = streamInfo.ColorPrimaries;
}
// workaround for mkv attached_pics losing filename due to being classified as video based on codec
if (stream.Type == MediaStreamType.EmbeddedImage && streamInfo.Tags != null && string.IsNullOrEmpty(stream.Comment))
{
stream.Comment = GetDictionaryValue(streamInfo.Tags, "filename");
}
}
else
{