Updating prebuilts and/or headers

1be6fc0d7406e0633b7e2cba49166a2f0a085cdd - gst-nvarguscamera/Makefile
bbf1372c3dcafed0074ce94daa3e4d92584f9ca9 - gst-nvarguscamera/3rdpartyheaders.tbz2
704bc9c630378dd0ab3da09d386464aaca369d05 - gst-nvarguscamera/gstnvarguscamerasrc.hpp
6338573fa67657610f1bbbd386ae29c665de3cfb - gst-nvarguscamera/gstnvarguscamerasrc.cpp
f2949ff626879be5aaeabf40e9ad8eab11238b6e - gst-nvarguscamera/gstnvarguscamera_utils.h
ed8273ff6102bb0b4fa7975a401b12b3e95a7187 - gst-nvarguscamera/nvbufsurface.h
5b71a3ab30d24949dcf3770e509d17dd1af64256 - gst-nvarguscamera/gstnvarguscamera_utils.cpp
fa14f1cb043a26a6465ce793ac78479d8f6afa02 - gst-nvarguscamera/gstnvdsbufferpool.h

Change-Id: I59011437bf9852ccb9d805c5eb1b036d0dacba81

commitFile.txt

@@ -1,10 +1,10 @@
 Updating prebuilts and/or headers 
 
-ed8273ff6102bb0b4fa7975a401b12b3e95a7187 - gst-nvarguscamera/nvbufsurface.h
 1be6fc0d7406e0633b7e2cba49166a2f0a085cdd - gst-nvarguscamera/Makefile
-f2949ff626879be5aaeabf40e9ad8eab11238b6e - gst-nvarguscamera/gstnvarguscamera_utils.h
-5b71a3ab30d24949dcf3770e509d17dd1af64256 - gst-nvarguscamera/gstnvarguscamera_utils.cpp
+bbf1372c3dcafed0074ce94daa3e4d92584f9ca9 - gst-nvarguscamera/3rdpartyheaders.tbz2
 704bc9c630378dd0ab3da09d386464aaca369d05 - gst-nvarguscamera/gstnvarguscamerasrc.hpp
-9fd26f352da599c05d8d648a43f9db533fa34a38 - gst-nvarguscamera/gstnvarguscamerasrc.cpp
-148776e441cabf96340f87c88ba7ebd406ab0707 - gst-nvarguscamera/3rdpartyheaders.tbz2
+6338573fa67657610f1bbbd386ae29c665de3cfb - gst-nvarguscamera/gstnvarguscamerasrc.cpp
+f2949ff626879be5aaeabf40e9ad8eab11238b6e - gst-nvarguscamera/gstnvarguscamera_utils.h
+ed8273ff6102bb0b4fa7975a401b12b3e95a7187 - gst-nvarguscamera/nvbufsurface.h
+5b71a3ab30d24949dcf3770e509d17dd1af64256 - gst-nvarguscamera/gstnvarguscamera_utils.cpp
 fa14f1cb043a26a6465ce793ac78479d8f6afa02 - gst-nvarguscamera/gstnvdsbufferpool.h

gst-nvarguscamera/gstnvarguscamerasrc.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2023, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2017-2024, NVIDIA CORPORATION. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -69,12 +69,7 @@
 #define MIN_BUFFERS 6
 #define MAX_BUFFERS 8
 
-#define MIN_GAIN 1
-#define MAX_GAIN 16
-
-#define MIN_EXPOSURE_TIME 34000
-#define MAX_EXPOSURE_TIME 358733000
-
+// this is gain value applied by ISP, its default range is [1, 256].
 #define MIN_DIGITAL_GAIN 1
 #define MAX_DIGITAL_GAIN 256
 
@@ -596,6 +591,19 @@ bool StreamConsumer::threadExecute(GstNvArgusCameraSrc *src)
 
       if(src->gainRangePropSet == TRUE)
       {
+        if (src->controls.gainRange.low < sensorModeAnalogGainRange.min())
+        {
+          GST_ARGUS_PRINT("Invalid min gain value, using default minimum gain: %f instead.\n",
+                          sensorModeAnalogGainRange.min());
+          src->controls.gainRange.low = sensorModeAnalogGainRange.min();
+        }
+        if (src->controls.gainRange.high > sensorModeAnalogGainRange.max())
+        {
+          GST_ARGUS_PRINT("Invalid max gain value, using default maximum gain: %f instead.\n",
+                          sensorModeAnalogGainRange.max());
+          src->controls.gainRange.high = sensorModeAnalogGainRange.max();
+        }
+
         sensorModeAnalogGainRange.min() = src->controls.gainRange.low;
         sensorModeAnalogGainRange.max() = src->controls.gainRange.high;
         l_iRequestSourceSettings_ptr->setGainRange(sensorModeAnalogGainRange);
@@ -614,6 +622,19 @@ bool StreamConsumer::threadExecute(GstNvArgusCameraSrc *src)
 
       if(src->exposureTimePropSet == TRUE)
       {
+        if (src->controls.exposureTimeRange.low < limitExposureTimeRange.min())
+        {
+          GST_ARGUS_PRINT("Invalid min exp value, using default minimum exp: %ju instead.\n",
+                          limitExposureTimeRange.min());
+          src->controls.exposureTimeRange.low = limitExposureTimeRange.min();
+        }
+        if (src->controls.exposureTimeRange.high > limitExposureTimeRange.max())
+        {
+          GST_ARGUS_PRINT("Invalid max exp value, using default maximum exp: %ju instead.\n",
+                          limitExposureTimeRange.max());
+          src->controls.exposureTimeRange.high = limitExposureTimeRange.max();
+        }
+
         limitExposureTimeRange.min() = src->controls.exposureTimeRange.low;
         limitExposureTimeRange.max() = src->controls.exposureTimeRange.high;
         l_iRequestSourceSettings_ptr->setExposureTimeRange(limitExposureTimeRange);
@@ -1095,6 +1116,19 @@ static bool execute(int32_t cameraIndex,
 
   if(src->exposureTimePropSet == TRUE)
   {
+    if (src->controls.exposureTimeRange.low < limitExposureTimeRange.min())
+    {
+        GST_ARGUS_PRINT("Invalid min exp value, using default minimum exp: %ju instead.\n",
+                      limitExposureTimeRange.min());
+        src->controls.exposureTimeRange.low = limitExposureTimeRange.min();
+    }
+    if (src->controls.exposureTimeRange.high > limitExposureTimeRange.max())
+    {
+        GST_ARGUS_PRINT("Invalid max exp value, using default maximum exp: %ju instead.\n",
+                      limitExposureTimeRange.max());
+        src->controls.exposureTimeRange.high = limitExposureTimeRange.max();
+    }
+
     limitExposureTimeRange.min() = src->controls.exposureTimeRange.low;
     limitExposureTimeRange.max() = src->controls.exposureTimeRange.high;
     requestSourceSettings->setExposureTimeRange(limitExposureTimeRange);
@@ -1103,6 +1137,19 @@ static bool execute(int32_t cameraIndex,
 
   if(src->gainRangePropSet == TRUE)
   {
+    if (src->controls.gainRange.low < sensorModeAnalogGainRange.min())
+    {
+        GST_ARGUS_PRINT("Invalid min gain value, using default minimum gain: %f instead.\n",
+                        sensorModeAnalogGainRange.min());
+        src->controls.gainRange.low = sensorModeAnalogGainRange.min();
+    }
+    if (src->controls.gainRange.high > sensorModeAnalogGainRange.max())
+    {
+        GST_ARGUS_PRINT("Invalid max gain value, using default maximum gain: %f instead.\n",
+                        sensorModeAnalogGainRange.max());
+        src->controls.gainRange.high = sensorModeAnalogGainRange.max();
+    }
+
     sensorModeAnalogGainRange.min() = src->controls.gainRange.low;
     sensorModeAnalogGainRange.max() = src->controls.gainRange.high;
     requestSourceSettings->setGainRange(sensorModeAnalogGainRange);
@@ -1566,7 +1613,7 @@ static gboolean gst_nv_argus_camera_stop (GstBaseSrc * src_base)
   }
   g_thread_join(src->consumer_thread);
 
-    while (!g_queue_is_empty (src->nvmm_buffers)) {
+  while (!g_queue_is_empty (src->nvmm_buffers)) {
     buf = (GstBuffer *) g_queue_pop_head (src->nvmm_buffers);
     gst_buffer_unref (buf);
   }
@@ -1831,22 +1878,12 @@ static gboolean set_range (GstNvArgusCameraSrc *src, guint prop_id)
   {
      if(prop_id == PROP_GAIN_RANGE)
      {
-       if (array[0] < MIN_GAIN || array[1] > MAX_GAIN) {
-         GST_ARGUS_PRINT("Invalid Gain Range Input\n");
-         ret = FALSE;
-         goto done;
-       }
        range.low = array[0];
        range.high = array[1];
        src->controls.gainRange = range;
      }
      else if(prop_id == PROP_EXPOSURE_TIME_RANGE)
      {
-       if (array[0] < MIN_EXPOSURE_TIME || array[1] > MAX_EXPOSURE_TIME) {
-         GST_ARGUS_PRINT("Invalid Exposure Time Range Input\n");
-         ret = FALSE;
-         goto done;
-       }
        range.low = array[0];
        range.high = array[1];
        src->controls.exposureTimeRange = range;
@@ -2030,7 +2067,7 @@ gst_nv_argus_camera_src_class_init (GstNvArgusCameraSrcClass * klass)
           "\t\t\tUse string with values of ISP Digital Gain Range (low, high)\n"
           "\t\t\tin that order, to set the property.\n"
           "\t\t\teg: ispdigitalgainrange=\"1 8\"",
-          NVARGUSCAM_DEFAULT_GAIN_RANGE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+          NVARGUSCAM_DEFAULT_DIGITAL_GAIN_RANGE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   g_object_class_install_property (gobject_class, PROP_TNR_STRENGTH,
       g_param_spec_float ("tnr-strength", "TNR Strength",
@@ -2181,6 +2218,10 @@ static void gst_nv_argus_camera_src_finalize (GObject *object)
     g_free (src->ispDigitalGainRangeString);
     src->ispDigitalGainRangeString = NULL;
   }
+  if(src->outcaps) {
+    gst_caps_unref (src->outcaps);
+    src->outcaps = NULL;
+  }
 }
 
 static void

push_info.txt

@@ -1 +1 @@
-jetson_35.5_APT1
+jetson_35.6.1