Skip to content

Commit

Permalink
Update packages and regenerate
Browse files Browse the repository at this point in the history
  • Loading branch information
bruno-f-cruz committed Nov 20, 2024
1 parent 8dde900 commit 3532db9
Show file tree
Hide file tree
Showing 8 changed files with 1,717 additions and 12 deletions.
4 changes: 2 additions & 2 deletions bonsai/Bonsai.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Package id="AForge.Video" version="2.2.5" />
<Package id="AForge.Video.DirectShow" version="2.2.5" />
<Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.8.0" />
<Package id="AllenNeuralDynamics.Core" version="0.2.9" />
<Package id="AllenNeuralDynamics.Core" version="0.3.0" />
<Package id="AllenNeuralDynamics.Core.Design" version="0.2.2" />
<Package id="AllenNeuralDynamics.EnvironmentSensor" version="0.2.0" />
<Package id="AllenNeuralDynamics.HarpUtils" version="0.1.9" />
Expand Down Expand Up @@ -127,7 +127,7 @@
<AssemblyLocation assemblyName="AForge.Video" processorArchitecture="MSIL" location="Packages/AForge.Video.2.2.5/lib/AForge.Video.dll" />
<AssemblyLocation assemblyName="AForge.Video.DirectShow" processorArchitecture="MSIL" location="Packages/AForge.Video.DirectShow.2.2.5/lib/AForge.Video.DirectShow.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.8.0/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.2.9/lib/net472/AllenNeuralDynamics.Core.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.3.0/lib/net472/AllenNeuralDynamics.Core.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.Core.Design" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.Design.0.2.2/lib/net472/AllenNeuralDynamics.Core.Design.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.EnvironmentSensor" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.EnvironmentSensor.0.2.0/lib/net462/AllenNeuralDynamics.EnvironmentSensor.dll" />
<AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.1.9/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
Expand Down
2 changes: 1 addition & 1 deletion src/DataSchemas/aind_behavior_session_model.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"properties": {
"aind_behavior_services_pkg_version": {
"default": "0.8.8",
"default": "0.8.9",
"pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
"title": "aind_behavior_services package version",
"type": "string"
Expand Down
6 changes: 3 additions & 3 deletions src/DataSchemas/aind_video_encoding_benchmarks_rig.json
Original file line number Diff line number Diff line change
Expand Up @@ -748,13 +748,13 @@
"type": "string"
},
"output_arguments": {
"default": "-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 -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M",
"default": "-vf \"scale=out_color_matrix=bt709:out_range=full,format=bgr24,scale=out_range=full\" -c:v h264_nvenc -pix_fmt yuv420p -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p4 -rc vbr -cq 12 -b:v 0M -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M",
"description": "Output arguments",
"title": "Output Arguments",
"type": "string"
},
"input_arguments": {
"default": "-v verbose -colorspace bt709 -color_primaries bt709 -color_range full -color_trc linear",
"default": "-colorspace bt709 -color_primaries bt709 -color_range full -color_trc linear",
"description": "Input arguments",
"title": "Input Arguments",
"type": "string"
Expand Down Expand Up @@ -797,7 +797,7 @@
},
"properties": {
"aind_behavior_services_pkg_version": {
"default": "0.8.8",
"default": "0.8.9",
"pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
"title": "aind_behavior_services package version",
"type": "string"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"title": "Rng Seed"
},
"aind_behavior_services_pkg_version": {
"default": "0.8.8",
"default": "0.8.9",
"pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
"title": "aind_behavior_services package version",
"type": "string"
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/AindBehaviorSessionModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace AindVideoEncodingBenchmarksSchemas.Session
public partial class AindBehaviorSessionModel
{

private string _aindBehaviorServicesPkgVersion = "0.8.8";
private string _aindBehaviorServicesPkgVersion = "0.8.9";

private string _version = "0.3.0";

Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/AindVideoEncodingBenchmarksRig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1601,9 +1601,9 @@ public partial class VideoWriterFfmpeg : VideoWriter

private string _containerExtension = "mp4";

private string _outputArguments = "-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 -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M";
private string _outputArguments = "-vf \"scale=out_color_matrix=bt709:out_range=full,format=bgr24,scale=out_range=full\" -c:v h264_nvenc -pix_fmt yuv420p -color_range full -colorspace bt709 -color_trc linear -tune hq -preset p4 -rc vbr -cq 12 -b:v 0M -metadata author=\"Allen Institute for Neural Dynamics\" -maxrate 700M -bufsize 350M";

private string _inputArguments = "-v verbose -colorspace bt709 -color_primaries bt709 -color_range full -color_trc linear";
private string _inputArguments = "-colorspace bt709 -color_primaries bt709 -color_range full -color_trc linear";

public VideoWriterFfmpeg()
{
Expand Down Expand Up @@ -1816,7 +1816,7 @@ protected override bool PrintMembers(System.Text.StringBuilder stringBuilder)
public partial class AindVideoEncodingBenchmarksRig
{

private string _aindBehaviorServicesPkgVersion = "0.8.8";
private string _aindBehaviorServicesPkgVersion = "0.8.9";

private string _version = "0.1.2";

Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/AindVideoEncodingBenchmarksTaskLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public partial class AindVideoEncodingBenchmarksTaskParameters

private double? _rngSeed;

private string _aindBehaviorServicesPkgVersion = "0.8.8";
private string _aindBehaviorServicesPkgVersion = "0.8.9";

private bool _saveRawVideo = false;

Expand Down
Loading

0 comments on commit 3532db9

Please sign in to comment.