From 07af7daf2355e62456b30df4131ec1d6838d4934 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:13:00 -0800 Subject: [PATCH 1/4] Remove defaults from ffmpeg writer --- src/AllenNeuralDynamics.Core/FfmpegVideoWriter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AllenNeuralDynamics.Core/FfmpegVideoWriter.cs b/src/AllenNeuralDynamics.Core/FfmpegVideoWriter.cs index a9680f3..9672f7d 100644 --- a/src/AllenNeuralDynamics.Core/FfmpegVideoWriter.cs +++ b/src/AllenNeuralDynamics.Core/FfmpegVideoWriter.cs @@ -29,11 +29,11 @@ public class FfmpegVideoWriter : Sink [Editor(DesignTypes.MultilineStringEditor, DesignTypes.UITypeEditor)] [Description("The optional set of command-line arguments to use for configuring the video codec.")] - public string OutputArguments { get; set; } = @"-vf ""scale=out_color_matrix=bt709:out_range=full:sws_dither=none,format=yuv420p10le,colorspace=ispace=bt709:all=bt709:dither=none,scale=out_range=tv:sws_dither=none,format=yuv420p"" -c:v libx264 -preset veryslow -crf 18 -pix_fmt yuv420p -metadata author=""Allen Institute for Neural Dynamics"" -movflags +faststart+write_colr"; + public string OutputArguments { get; set; } [Editor(DesignTypes.MultilineStringEditor, DesignTypes.UITypeEditor)] [Description("The optional set of command-line arguments to use for configuring the input video stream.")] - public string InputArguments { get; set; } = "-colorspace bt709 -color_primaries bt709 -color_range full -color_trc linear"; + public string InputArguments { get; set; } public override IObservable Process(IObservable source) { From 9f01165a6b96b659cc9f55ea9ea1270628ca243a Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:41:15 -0800 Subject: [PATCH 2/4] Ensure video loggers output the original video sequence --- src/AllenNeuralDynamics.Core/LogSpinnakerFfmpeg.bonsai | 2 ++ src/AllenNeuralDynamics.Core/LogSpinnakerOpenCv.bonsai | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/AllenNeuralDynamics.Core/LogSpinnakerFfmpeg.bonsai b/src/AllenNeuralDynamics.Core/LogSpinnakerFfmpeg.bonsai index a587cc2..b585c6f 100644 --- a/src/AllenNeuralDynamics.Core/LogSpinnakerFfmpeg.bonsai +++ b/src/AllenNeuralDynamics.Core/LogSpinnakerFfmpeg.bonsai @@ -80,6 +80,7 @@ Value.Image as Image) -colorspace rgb -color_primaries bt709 -color_trc linear + @@ -94,6 +95,7 @@ Value.Image as Image) + \ No newline at end of file diff --git a/src/AllenNeuralDynamics.Core/LogSpinnakerOpenCv.bonsai b/src/AllenNeuralDynamics.Core/LogSpinnakerOpenCv.bonsai index 5600a16..07bfbc9 100644 --- a/src/AllenNeuralDynamics.Core/LogSpinnakerOpenCv.bonsai +++ b/src/AllenNeuralDynamics.Core/LogSpinnakerOpenCv.bonsai @@ -83,6 +83,7 @@ Value.Image as Image) NearestNeighbor + @@ -97,6 +98,7 @@ Value.Image as Image) + \ No newline at end of file From 329d0079e4ad89c39c9521c087623556880bfb14 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:41:59 -0800 Subject: [PATCH 3/4] Bump minor --- src/AllenNeuralDynamics.Core/AllenNeuralDynamics.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AllenNeuralDynamics.Core/AllenNeuralDynamics.Core.csproj b/src/AllenNeuralDynamics.Core/AllenNeuralDynamics.Core.csproj index f3fc22c..55aa5d6 100644 --- a/src/AllenNeuralDynamics.Core/AllenNeuralDynamics.Core.csproj +++ b/src/AllenNeuralDynamics.Core/AllenNeuralDynamics.Core.csproj @@ -9,7 +9,7 @@ Bonsai Rx Core AllenNeuralDynamics net472 strict - 0.2.9 + 0.3.0 From 78fa9608d651656eb50241ec5d51721f993bfd1e Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:54:36 -0800 Subject: [PATCH 4/4] Remove defaults --- docs/workflows/SaveSpinnakerCamera.bonsai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/workflows/SaveSpinnakerCamera.bonsai b/docs/workflows/SaveSpinnakerCamera.bonsai index 8c2fbb0..39be11d 100644 --- a/docs/workflows/SaveSpinnakerCamera.bonsai +++ b/docs/workflows/SaveSpinnakerCamera.bonsai @@ -69,8 +69,8 @@ BehaviorVideos RandomCamera mp4 - -vf "scale=out_color_matrix=bt709:out_range=full" -c:v h264_nvenc -pix_fmt nv12 -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p4 -rc vbr -cq 12 -b:v 0M -maxrate 700M -bufsize 350M - -colorspace rgb -color_primaries bt709 -color_trc linear + + Verbose 120