Merge remote-tracking branch 'origin/master' into dev

frigate/detectors/detector_config.py

@@ -161,6 +161,10 @@ class ModelConfig(BaseModel):
         if model_info.get("inputDataType"):
             self.input_dtype = InputDTypeEnum(model_info["inputDataType"])
 
+        # RKNN always uses NHWC
+        if detector == "rknn":
+            self.input_tensor = InputTensorEnum.nhwc
+
         # generate list of attribute labels
         self.attributes_map = {
             **model_info.get("attributes", DEFAULT_ATTRIBUTE_LABEL_MAP),

frigate/detectors/plugins/rknn.py

@@ -165,8 +165,9 @@ class Rknn(DetectionApi):
         if not os.path.isdir(model_cache_dir):
             os.mkdir(model_cache_dir)
 
+        GITHUB_ENDPOINT = os.environ.get("GITHUB_ENDPOINT", "https://github.com")
         urllib.request.urlretrieve(
-            f"https://github.com/MarcA711/rknn-models/releases/download/v2.3.2-2/{filename}",
+            f"{GITHUB_ENDPOINT}/MarcA711/rknn-models/releases/download/v2.3.2-2/{filename}",
             model_cache_dir + filename,
         )