mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-02-18 11:08:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

FF-2018 - fixed logging

Browse Source
This commit is contained in:
John Andrews
2025-01-28 08:15:22 +13:00
parent 53e5e89544
commit e70acf0c2f
3 changed files with 1 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
FileFlowsPlugins.sln.DotSettings.user
View File

@@ -1,23 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5dbddb4193d14589980523c20aa2a71e8c00_003F6a_003F5091974e_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANodeParameters_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fdee079649268c95f3c443b7776c8ad605d45d1e95e2149305c1b1e8c5f6ad8_003FNodeParameters_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANodeParameters_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fcfc0f1386e5572143ccffd1bc8bd48379d3d91186af93c9b49550ed882f885_003FNodeParameters_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANodeParameters_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Ff7d0aedce0548bec84f43fedd356938ebd764763a1151e1a2eb96ec0e8c612_003FNodeParameters_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APlugin_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F89a73480168b2779213e1e33ed41c89fcf9e077bebd56282de80fbc324f28_003FPlugin_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=b20312da_002Dc17d_002D4b13_002Db8cd_002D4b8138bf9db8/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="BurnIn" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
&lt;Or&gt;
&lt;TestAncestor&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FFmpegBuilder_SubtitleBurnInTests.BurnIn&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::VideoNodes.Tests.SubtitleExtractorTests.SubtitleExtractor_Extension_Test&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::VideoNodes.Tests.SubtitleExtractorTests&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_LanguageRemoverTests.KeepOnlyGerman&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_LanguageRemoverTests.RemoveEnglishAudio&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_LanguageRemoverTests&lt;/TestId&gt;
&lt;TestId&gt;MSTest::7AE24315-9FE7-429F-83D9-C989CFF5420D::net8.0::BasicNodes.Tests.LogVariablesTests&lt;/TestId&gt;
&lt;TestId&gt;MSTest::7AE24315-9FE7-429F-83D9-C989CFF5420D::net8.0::BasicNodes.Tests.VariableMatchTests&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::FileFlows.VideoNodes.Tests.FfmpegBuilderTests.FfmpegBuilder_BasicTests.FfmpegBuilder_SubtitleTrackMerge_FileMatchesTests_WithNumber&lt;/TestId&gt;
&lt;TestId&gt;MSTest::CF96D3D1-1D8B-47F7-BEA7-BB238F7A566A::net8.0::VideoNodes.Tests.VideoHasStreamTests&lt;/TestId&gt;
&lt;/TestAncestor&gt;
&lt;ProjectFile&gt;F9AEA7E3-32F7-450D-A9A4-BFB95E6CC899/d:Tests/f:DownloadUrlTests.cs&lt;/ProjectFile&gt;
&lt;/Or&gt;
&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>

36
VideoNodes/FfmpegBuilderNodes/Video/FFmpegBuilderVideoBitrateEncode/FfmpegBuilderVideoBitrateEncode.cs
View File

@@ -113,42 +113,6 @@ public partial class FfmpegBuilderVideoBitrateEncode:VideoEncodeBase
return 1;
}
/// <summary>
/// Adjust the parameters to use a constant bitrate
/// </summary>
/// <param name="args">the node parameters</param>
/// <param name="parameters">the parameters to alter</param>
/// <returns>the adjusted parmaters</returns>
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<string>();
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<string> 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);

2
VideoNodes/LogicalNodes/VideoBitCheck.cs
View File

@@ -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;