diff --git a/FileFlowsPlugins.sln.DotSettings.user b/FileFlowsPlugins.sln.DotSettings.user deleted file mode 100644 index 42a86ac4..00000000 --- a/FileFlowsPlugins.sln.DotSettings.user +++ /dev/null @@ -1,23 +0,0 @@ - - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - <SessionState ContinuousTestingMode="0" IsActive="True" Name="BurnIn" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> - <Or> - <TestAncestor> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FFmpegBuilder_SubtitleBurnInTests.BurnIn</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::VideoNodes.Tests.SubtitleExtractorTests.SubtitleExtractor_Extension_Test</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::VideoNodes.Tests.SubtitleExtractorTests</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_LanguageRemoverTests.KeepOnlyGerman</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_LanguageRemoverTests.RemoveEnglishAudio</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_LanguageRemoverTests</TestId> - <TestId>MSTest::7AE24315-9FE7-429F-83D9-C989CFF5420D::net8.0::BasicNodes.Tests.LogVariablesTests</TestId> - <TestId>MSTest::7AE24315-9FE7-429F-83D9-C989CFF5420D::net8.0::BasicNodes.Tests.VariableMatchTests</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_BasicTests.FfmpegBuilder_SubtitleTrackMerge_FileMatchesTests_WithNumber</TestId> - <TestId>MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::VideoNodes.Tests.VideoHasStreamTests</TestId> - </TestAncestor> - <ProjectFile>F9AEA7E3-32F7-450D-A9A4-BFB95E6CC899/d:Tests/f:DownloadUrlTests.cs</ProjectFile> - </Or> -</SessionState> \ No newline at end of file diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FFmpegBuilderVideoBitrateEncode/FfmpegBuilderVideoBitrateEncode.cs b/VideoNodes/FfmpegBuilderNodes/Video/FFmpegBuilderVideoBitrateEncode/FfmpegBuilderVideoBitrateEncode.cs index f2c32416..630ea391 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FFmpegBuilderVideoBitrateEncode/FfmpegBuilderVideoBitrateEncode.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FFmpegBuilderVideoBitrateEncode/FfmpegBuilderVideoBitrateEncode.cs @@ -113,42 +113,6 @@ public partial class FfmpegBuilderVideoBitrateEncode:VideoEncodeBase return 1; } - /// - /// Adjust the parameters to use a constant bitrate - /// - /// the node parameters - /// the parameters to alter - /// the adjusted parmaters - private string[] AdjustForBitrate(NodeParameters args, string[] parameters) - { - var toRemove = new [] { "-rc", "-qp", "-preset", "-spatial-aq", "-g", "-global_quality:v" }; - int index = Array.FindIndex(parameters, p => toRemove.Contains(p)); - var modified = new List(); - for (int i = 0; i < parameters.Length - 1; i++) - { - if (toRemove.Contains(parameters[i])) - { - i++; - continue; - } - modified.Add(parameters[i]); - } - modified.Insert(index, "-b:v:{index}"); - modified.Insert(index + 1, Bitrate + "k"); - return modified.ToArray(); - } - - internal static IEnumerable GetEncodingParameters(NodeParameters args, string codec, int bitrate, string encoder, float fps, string device) - { - if (codec == CODEC_H264) - return H264(args, false, encoder, bitrate).Select(x => x.Replace("{index}", "0")); - if (codec == CODEC_H265 || codec == CODEC_H265_10BIT) - return H265(null, args, codec == CODEC_H265_10BIT, bitrate, encoder, fps).Select(x => x.Replace("{index}", "0")); - if(codec == CODEC_AV1) - return AV1(args, codec == CODEC_AV1_10BIT, bitrate, encoder, device).Select(x => x.Replace("{index}", "0")); - - throw new Exception("Unsupported codec: " + codec); - } private static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX); diff --git a/VideoNodes/LogicalNodes/VideoBitCheck.cs b/VideoNodes/LogicalNodes/VideoBitCheck.cs index f492886e..9791856e 100644 --- a/VideoNodes/LogicalNodes/VideoBitCheck.cs +++ b/VideoNodes/LogicalNodes/VideoBitCheck.cs @@ -46,7 +46,7 @@ public class VideoBitCheck : VideoNode bool is8Bit = videoInfo.VideoStreams?.Any(x => x.Bits == 8) == true; if (is8Bit) { - args.Logger?.ILog("Video is 12 bit"); + args.Logger?.ILog("Video is 8 bit"); return 1; } bool is10Bit = videoInfo.VideoStreams?.Any(x => x.Bits == 10) == true;