Merge pull request #212 from kerberos-io/fix/ovrride-base-width

fix/ovrride-base-width
Reset baseWidth and baseHeight in StoreConfig function
2026-03-02 22:59:15 +00:00 · 2025-08-12 07:05:43 +02:00 · 2025-08-12 04:47:50 +00:00 · 2025-08-11 21:10:33 +00:00 · 2025-08-11 23:06:24 +02:00
2 changed files with 10 additions and 0 deletions
--- a/machinery/src/components/Kerberos.go
+++ b/machinery/src/components/Kerberos.go
@@ -180,6 +180,9 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	if baseWidth > 0 && baseHeight == 0 {
 		widthAspectRatio := float64(baseWidth) / float64(width)
 		configuration.Config.Capture.IPCamera.BaseHeight = int(float64(height) * widthAspectRatio)
+	} else if baseHeight > 0 && baseWidth > 0 {
+		configuration.Config.Capture.IPCamera.BaseHeight = baseHeight
+		configuration.Config.Capture.IPCamera.BaseWidth = baseWidth
 	} else {
 		configuration.Config.Capture.IPCamera.BaseHeight = height
 		configuration.Config.Capture.IPCamera.BaseWidth = width
@@ -247,6 +250,9 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 		if baseWidth > 0 && baseHeight == 0 {
 			widthAspectRatio := float64(baseWidth) / float64(width)
 			configuration.Config.Capture.IPCamera.BaseHeight = int(float64(height) * widthAspectRatio)
+		} else if baseHeight > 0 && baseWidth > 0 {
+			configuration.Config.Capture.IPCamera.BaseHeight = baseHeight
+			configuration.Config.Capture.IPCamera.BaseWidth = baseWidth
 		} else {
 			configuration.Config.Capture.IPCamera.BaseHeight = height
 			configuration.Config.Capture.IPCamera.BaseWidth = width
--- a/machinery/src/config/main.go
+++ b/machinery/src/config/main.go
@@ -591,6 +591,10 @@ func StoreConfig(configDirectory string, config models.Config) error {
 		config.Encryption.PrivateKey = encryptionPrivateKey
 	}

+	// Reset the basewidth and baseheight
+	config.Capture.IPCamera.BaseWidth = 0
+	config.Capture.IPCamera.BaseHeight = 0
+
 	// Save into database
 	if os.Getenv("DEPLOYMENT") == "factory" || os.Getenv("MACHINERY_ENVIRONMENT") == "kubernetes" {
 		// Write to mongodb
Author	SHA1	Message	Date
Cédric Verstraeten	1f9772d472	Merge pull request #212 from kerberos-io/fix/ovrride-base-width fix/ovrride-base-width	2025-08-12 07:05:43 +02:00
cedricve	94cf361b55	Reset baseWidth and baseHeight in StoreConfig function	2025-08-12 04:47:50 +00:00
cedricve	6acdf258e7	Fix typo in environment variable override function name	2025-08-11 21:10:33 +00:00
cedricve	cc0a810ab3	Handle both baseWidth and baseHeight in IPCamera config Adds logic to set IPCamera BaseWidth and BaseHeight when both values are provided, instead of only calculating aspect ratio. Also fixes a typo in the function call to override configuration with environment variables.	2025-08-11 23:06:24 +02:00