diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll index 45407c66..ebb00c68 100644 Binary files a/FileFlows.Plugin.dll and b/FileFlows.Plugin.dll differ diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb index 046d4d16..d8c21888 100644 Binary files a/FileFlows.Plugin.pdb and b/FileFlows.Plugin.pdb differ diff --git a/MetaNodes/Tests/TheMovieDb/TVShowLookupTests.cs b/MetaNodes/Tests/TheMovieDb/TVShowLookupTests.cs index 2cc15163..58839eff 100644 --- a/MetaNodes/Tests/TheMovieDb/TVShowLookupTests.cs +++ b/MetaNodes/Tests/TheMovieDb/TVShowLookupTests.cs @@ -32,6 +32,30 @@ public class TVShowLookupTests Assert.AreEqual("The Batman", args.Variables["tvshow.Title"]); Assert.AreEqual(2004, args.Variables["tvshow.Year"]); } + + + [TestMethod] + public void TvdbID_Test() + { + var logger = new TestLogger(); + var args = new FileFlows.Plugin.NodeParameters("/media/TV/The Walking Dead (2010) [tvdbid-153021]/Season 07/S07E03 - The Cell [HDTV-1080p][AAC 5.1][h265].mkv", logger, false, string.Empty, null); + + var element = new TVShowLookup(); + element.UseFolderName = true; + + var result = element.Execute(args); + Assert.AreEqual(1, result); + Assert.IsTrue(args.Parameters.ContainsKey(Globals.TV_SHOW_INFO)); + + var info = args.Parameters[Globals.TV_SHOW_INFO] as TVShowInfo; + Assert.IsNotNull(info); + + Assert.AreEqual("The Walking Dead", info.Name); + Assert.AreEqual(2010, info.FirstAirDate.Year); + Assert.AreEqual("en", info.OriginalLanguage); + Assert.AreEqual("The Walking Dead", args.Variables["tvshow.Title"]); + Assert.AreEqual(2010, args.Variables["tvshow.Year"]); + } [TestMethod] public void TheBatman_Folder() diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs index 84ca7ad3..2a1f0d76 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs @@ -18,6 +18,7 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode internal const string CODEC_H264 = "h264"; internal const string CODEC_H265 = "h265"; + internal const string CODEC_H265_8BIT = "h265 8BIT"; internal const string CODEC_H265_10BIT = "h265 10BIT"; internal const string CODEC_AV1 = "av1"; internal const string CODEC_AV1_10BIT = "av1 10BIT"; @@ -63,6 +64,7 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode new () { Label = "H.264", Value = CODEC_H264 }, // new () { Label = "H.264 (10-Bit)", Value = CODEC_H264_10BIT }, new () { Label = "HEVC", Value = CODEC_H265 }, + new () { Label = "HEVC (8-Bit)", Value = CODEC_H265_8BIT }, new () { Label = "HEVC (10-Bit)", Value = CODEC_H265_10BIT }, new () { Label = "AV1", Value = CODEC_AV1 }, new () { Label = "AV1 (10-Bit)", Value = CODEC_AV1_10BIT }, @@ -183,9 +185,9 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode stream.EncodingParameters.AddRange(encodingParameters); stream.Codec = CODEC_H264; } - else if (Codec is CODEC_H265 or CODEC_H265_10BIT) + else if (Codec is CODEC_H265 or CODEC_H265_10BIT or CODEC_H265_8BIT) { - bool tenBit = Codec == CODEC_H265_10BIT || stream.Stream.Is10Bit; + bool tenBit = (Codec == CODEC_H265_10BIT || stream.Stream.Is10Bit) && (Codec != CODEC_H265_8BIT); args.Logger?.ILog("10 Bit: " + tenBit); var encodingParameters = H265(stream, args, tenBit, Quality, encoder, stream.Stream.FramesPerSecond, Speed).ToArray();