added kvs retention period arg (#1119)

Author: liamwebsterxyz

adapters/gst/sinks/multistream_kvs.py

@@ -75,6 +75,7 @@ def __init__(self):
 class Config:
     def __init__(self):
         self.allow_create_stream = opt_config('ALLOW_CREATE_STREAM', False, strtobool)
+        self.retention_period_hours = opt_config('RETENTION_PERIOD_HOURS', 24, int)
         self.stream_name_prefix = opt_config('STREAM_NAME_PREFIX', '')
         self.kvssdk_loglevel = os.environ.get('KVSSDK_LOGLEVEL', 'INFO')
         self.zmq: ZmqConfig = ZmqConfig()
@@ -108,6 +109,7 @@ def __init__(
             round(Fraction(frame_params.framerate)),
             config.buffer.low_threshold,
             config.buffer.high_threshold,
+            config.retention_period_hours,
         )
         self.stream_started = False
 

libs/pykvssdk/pykvssdk/consts.h

@@ -8,7 +8,6 @@
 #define TIME_100NS_TO_1S (TIME_100NS_TO_1MS * 1000)
 
 // Defaults
-#define DEFAULT_RETENTION_PERIOD std::chrono::hours(24)
 #define DEFAULT_MAX_LATENCY std::chrono::seconds(10)
 #define DEFAULT_FRAGMENT_DURATION std::chrono::seconds(20)
 #define DEFAULT_TIMECODE_SCALE std::chrono::milliseconds(1)

libs/pykvssdk/pykvssdk/kvs_wrapper.cpp

@@ -21,7 +21,8 @@ KvsWrapper::KvsWrapper(
     bool allow_stream_creation,
     uint32_t framerate,
     uint32_t low_threshold,
-    uint32_t high_threshold
+    uint32_t high_threshold,
+    uint32_t retention_period_hours
 ) {
     std::string content_type, codec_id;
     if (codec == "h264") {
@@ -69,7 +70,7 @@ KvsWrapper::KvsWrapper(
     std::unique_ptr<video::StreamDefinition> stream_definition(
         new video::StreamDefinition(
             stream_name,
-            DEFAULT_RETENTION_PERIOD,
+            std::chrono::hours(retention_period_hours),
             nullptr, // tags
             "", // kms_key_id
             STREAMING_TYPE_OFFLINE,

libs/pykvssdk/pykvssdk/kvs_wrapper.h

@@ -21,7 +21,8 @@ class KvsWrapper {
         bool allow_stream_creation,
         uint32_t framerate,
         uint32_t low_threshold,
-        uint32_t high_threshold
+        uint32_t high_threshold,
+        uint32_t retention_period_hours = 24
     );
 
     bool start(const char *codec_private_data, size_t codec_private_data_size);

libs/pykvssdk/pykvssdk/pykvssink.cpp

@@ -22,8 +22,19 @@ PYBIND11_MODULE(pykvssdk, m) {
                 bool,
                 uint32_t,
                 uint32_t,
+                uint32_t,
                 uint32_t
-            >()
+            >(),
+            py::arg("region"),
+            py::arg("access_key"),
+            py::arg("secret_key"),
+            py::arg("stream_name"),
+            py::arg("codec"),
+            py::arg("allow_stream_creation"),
+            py::arg("framerate"),
+            py::arg("low_threshold"),
+            py::arg("high_threshold"),
+            py::arg("retention_period_hours") = 24
         )
         .def("start", &KvsWrapper::start)
         .def("stop_sync", &KvsWrapper::stop_sync)