parent
3f598ffa6f
commit
599ad86657
Binary file not shown.
|
@ -4,6 +4,7 @@ using NUnit.Framework;
|
||||||
using NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augmenters.Quality;
|
using NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augmenters.Quality;
|
||||||
using NzbDrone.Core.MediaFiles.MediaInfo;
|
using NzbDrone.Core.MediaFiles.MediaInfo;
|
||||||
using NzbDrone.Core.Parser.Model;
|
using NzbDrone.Core.Parser.Model;
|
||||||
|
using NzbDrone.Core.Qualities;
|
||||||
using NzbDrone.Core.Test.Framework;
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augmenters.Quality
|
namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augmenters.Quality
|
||||||
|
@ -65,6 +66,47 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators.Au
|
||||||
|
|
||||||
result.Should().NotBe(null);
|
result.Should().NotBe(null);
|
||||||
result.Resolution.Should().Be(expectedResolution);
|
result.Resolution.Should().Be(expectedResolution);
|
||||||
|
result.Source.Should().Be(QualitySource.Unknown);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_include_source_if_extracted_from_title()
|
||||||
|
{
|
||||||
|
var mediaInfo = Builder<MediaInfoModel>.CreateNew()
|
||||||
|
.With(m => m.Width = 1920)
|
||||||
|
.With(m => m.Height = 1080)
|
||||||
|
.With(m => m.Title = "Series.Title.S01E05.WEB.x264-Sonarr")
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
var localEpisode = Builder<LocalEpisode>.CreateNew()
|
||||||
|
.With(l => l.MediaInfo = mediaInfo)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
var result = Subject.AugmentQuality(localEpisode, null);
|
||||||
|
|
||||||
|
result.Should().NotBe(null);
|
||||||
|
result.Resolution.Should().Be(1080);
|
||||||
|
result.Source.Should().Be(QualitySource.Web);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_have_unknown_source_if_no_source_extracted_from_title()
|
||||||
|
{
|
||||||
|
var mediaInfo = Builder<MediaInfoModel>.CreateNew()
|
||||||
|
.With(m => m.Width = 1920)
|
||||||
|
.With(m => m.Height = 1080)
|
||||||
|
.With(m => m.Title = "Series.Title.S01E05.x264-Sonarr")
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
var localEpisode = Builder<LocalEpisode>.CreateNew()
|
||||||
|
.With(l => l.MediaInfo = mediaInfo)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
var result = Subject.AugmentQuality(localEpisode, null);
|
||||||
|
|
||||||
|
result.Should().NotBe(null);
|
||||||
|
result.Resolution.Should().Be(1080);
|
||||||
|
result.Source.Should().Be(QualitySource.Unknown);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||||
info.AudioFormat.Should().Be("aac");
|
info.AudioFormat.Should().Be("aac");
|
||||||
info.AudioCodecID.Should().Be("mp4a");
|
info.AudioCodecID.Should().Be("mp4a");
|
||||||
info.AudioProfile.Should().Be("LC");
|
info.AudioProfile.Should().Be("LC");
|
||||||
info.AudioBitrate.Should().Be(125488);
|
info.AudioBitrate.Should().Be(125509);
|
||||||
info.AudioChannels.Should().Be(2);
|
info.AudioChannels.Should().Be(2);
|
||||||
info.AudioChannelPositions.Should().Be("stereo");
|
info.AudioChannelPositions.Should().Be("stereo");
|
||||||
info.AudioLanguages.Should().BeEquivalentTo("eng");
|
info.AudioLanguages.Should().BeEquivalentTo("eng");
|
||||||
|
@ -59,12 +59,13 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||||
info.RunTime.Seconds.Should().Be(10);
|
info.RunTime.Seconds.Should().Be(10);
|
||||||
info.ScanType.Should().Be("Progressive");
|
info.ScanType.Should().Be("Progressive");
|
||||||
info.Subtitles.Should().BeEmpty();
|
info.Subtitles.Should().BeEmpty();
|
||||||
info.VideoBitrate.Should().Be(193328);
|
info.VideoBitrate.Should().Be(193694);
|
||||||
info.VideoFps.Should().Be(24);
|
info.VideoFps.Should().Be(24);
|
||||||
info.Width.Should().Be(480);
|
info.Width.Should().Be(480);
|
||||||
info.VideoBitDepth.Should().Be(8);
|
info.VideoBitDepth.Should().Be(8);
|
||||||
info.VideoColourPrimaries.Should().Be("smpte170m");
|
info.VideoColourPrimaries.Should().Be("smpte170m");
|
||||||
info.VideoTransferCharacteristics.Should().Be("bt709");
|
info.VideoTransferCharacteristics.Should().Be("bt709");
|
||||||
|
info.Title.Should().Be("Sample Title");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
@ -87,7 +88,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||||
info.AudioFormat.Should().Be("aac");
|
info.AudioFormat.Should().Be("aac");
|
||||||
info.AudioCodecID.Should().Be("mp4a");
|
info.AudioCodecID.Should().Be("mp4a");
|
||||||
info.AudioProfile.Should().Be("LC");
|
info.AudioProfile.Should().Be("LC");
|
||||||
info.AudioBitrate.Should().Be(125488);
|
info.AudioBitrate.Should().Be(125509);
|
||||||
info.AudioChannels.Should().Be(2);
|
info.AudioChannels.Should().Be(2);
|
||||||
info.AudioChannelPositions.Should().Be("stereo");
|
info.AudioChannelPositions.Should().Be("stereo");
|
||||||
info.AudioLanguages.Should().BeEquivalentTo("eng");
|
info.AudioLanguages.Should().BeEquivalentTo("eng");
|
||||||
|
@ -95,11 +96,12 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||||
info.RunTime.Seconds.Should().Be(10);
|
info.RunTime.Seconds.Should().Be(10);
|
||||||
info.ScanType.Should().Be("Progressive");
|
info.ScanType.Should().Be("Progressive");
|
||||||
info.Subtitles.Should().BeEmpty();
|
info.Subtitles.Should().BeEmpty();
|
||||||
info.VideoBitrate.Should().Be(193328);
|
info.VideoBitrate.Should().Be(193694);
|
||||||
info.VideoFps.Should().Be(24);
|
info.VideoFps.Should().Be(24);
|
||||||
info.Width.Should().Be(480);
|
info.Width.Should().Be(480);
|
||||||
info.VideoColourPrimaries.Should().Be("smpte170m");
|
info.VideoColourPrimaries.Should().Be("smpte170m");
|
||||||
info.VideoTransferCharacteristics.Should().Be("bt709");
|
info.VideoTransferCharacteristics.Should().Be("bt709");
|
||||||
|
info.Title.Should().Be("Sample Title");
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase(8, "", "", "", null, HdrFormat.None)]
|
[TestCase(8, "", "", "", null, HdrFormat.None)]
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Core.Download;
|
using NzbDrone.Core.Download;
|
||||||
|
using NzbDrone.Core.Parser;
|
||||||
using NzbDrone.Core.Parser.Model;
|
using NzbDrone.Core.Parser.Model;
|
||||||
|
using NzbDrone.Core.Qualities;
|
||||||
|
|
||||||
namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augmenters.Quality
|
namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augmenters.Quality
|
||||||
{
|
{
|
||||||
|
@ -25,29 +28,45 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augment
|
||||||
|
|
||||||
var width = localEpisode.MediaInfo.Width;
|
var width = localEpisode.MediaInfo.Width;
|
||||||
var height = localEpisode.MediaInfo.Height;
|
var height = localEpisode.MediaInfo.Height;
|
||||||
|
var source = QualitySource.Unknown;
|
||||||
|
var sourceConfidence = Confidence.Default;
|
||||||
|
var title = localEpisode.MediaInfo.Title;
|
||||||
|
|
||||||
|
if (title.IsNotNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
var parsedQuality = QualityParser.ParseQualityName(title.Trim());
|
||||||
|
|
||||||
|
// Only use the quality if it's not unknown and the source is from the name (which is MediaInfo's title in this case)
|
||||||
|
if (parsedQuality.Quality.Source != QualitySource.Unknown &&
|
||||||
|
parsedQuality.SourceDetectionSource == QualityDetectionSource.Name)
|
||||||
|
{
|
||||||
|
source = parsedQuality.Quality.Source;
|
||||||
|
sourceConfidence = Confidence.MediaInfo;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (width >= 3200 || height >= 2100)
|
if (width >= 3200 || height >= 2100)
|
||||||
{
|
{
|
||||||
_logger.Trace("Resolution {0}x{1} considered 2160p", width, height);
|
_logger.Trace("Resolution {0}x{1} considered 2160p", width, height);
|
||||||
return AugmentQualityResult.ResolutionOnly(2160, Confidence.MediaInfo);
|
return AugmentQualityResult.SourceAndResolutionOnly(source, sourceConfidence, 2160, Confidence.MediaInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (width >= 1800 || height >= 1000)
|
if (width >= 1800 || height >= 1000)
|
||||||
{
|
{
|
||||||
_logger.Trace("Resolution {0}x{1} considered 1080p", width, height);
|
_logger.Trace("Resolution {0}x{1} considered 1080p", width, height);
|
||||||
return AugmentQualityResult.ResolutionOnly(1080, Confidence.MediaInfo);
|
return AugmentQualityResult.SourceAndResolutionOnly(source, sourceConfidence, 1080, Confidence.MediaInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (width >= 1200 || height >= 700)
|
if (width >= 1200 || height >= 700)
|
||||||
{
|
{
|
||||||
_logger.Trace("Resolution {0}x{1} considered 720p", width, height);
|
_logger.Trace("Resolution {0}x{1} considered 720p", width, height);
|
||||||
return AugmentQualityResult.ResolutionOnly(720, Confidence.MediaInfo);
|
return AugmentQualityResult.SourceAndResolutionOnly(source, sourceConfidence, 720, Confidence.MediaInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (width > 0 && height > 0)
|
if (width > 0 && height > 0)
|
||||||
{
|
{
|
||||||
_logger.Trace("Resolution {0}x{1} considered 480p", width, height);
|
_logger.Trace("Resolution {0}x{1} considered 480p", width, height);
|
||||||
return AugmentQualityResult.ResolutionOnly(480, Confidence.MediaInfo);
|
return AugmentQualityResult.SourceAndResolutionOnly(source, sourceConfidence, 480, Confidence.MediaInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.Trace("Resolution {0}x{1}", width, height);
|
_logger.Trace("Resolution {0}x{1}", width, height);
|
||||||
|
|
|
@ -36,5 +36,10 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators.Augment
|
||||||
{
|
{
|
||||||
return new AugmentQualityResult(QualitySource.Unknown, Confidence.Default, resolution, resolutionConfidence, null, Confidence.Default);
|
return new AugmentQualityResult(QualitySource.Unknown, Confidence.Default, resolution, resolutionConfidence, null, Confidence.Default);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static AugmentQualityResult SourceAndResolutionOnly(QualitySource source, Confidence sourceConfidence, int resolution, Confidence resolutionConfidence)
|
||||||
|
{
|
||||||
|
return new AugmentQualityResult(source, sourceConfidence, resolution, resolutionConfidence, null, Confidence.Default);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
using FFMpegCore;
|
using FFMpegCore;
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
|
|
||||||
|
@ -57,5 +58,8 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
|
||||||
public List<string> Subtitles { get; set; }
|
public List<string> Subtitles { get; set; }
|
||||||
|
|
||||||
public string ScanType { get; set; }
|
public string ScanType { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public string Title { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,6 +101,11 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
|
||||||
mediaInfoModel.RawStreamData = ffprobeOutput;
|
mediaInfoModel.RawStreamData = ffprobeOutput;
|
||||||
mediaInfoModel.SchemaRevision = CURRENT_MEDIA_INFO_SCHEMA_REVISION;
|
mediaInfoModel.SchemaRevision = CURRENT_MEDIA_INFO_SCHEMA_REVISION;
|
||||||
|
|
||||||
|
if (analysis.Format.Tags?.TryGetValue("title", out var title) ?? false)
|
||||||
|
{
|
||||||
|
mediaInfoModel.Title = title;
|
||||||
|
}
|
||||||
|
|
||||||
FFProbeFrames frames = null;
|
FFProbeFrames frames = null;
|
||||||
|
|
||||||
// if it looks like PQ10 or similar HDR, do a frame analysis to figure out which type it is
|
// if it looks like PQ10 or similar HDR, do a frame analysis to figure out which type it is
|
||||||
|
|
Loading…
Reference in New Issue