Add Kojima camera database with OUI prefix

- Fix [PASWORD] typo in wanscam.json, correct to [PASSWORD]
- Remove "Unlisted [UNSERE!]" junk model name from dahua.json
- Remove {HX} artifact from LS-F2 model name in h.264-network-dvr.json
- Remove cisco-7 and cisco-29 stream entries with [code] placeholder (unknown/invalid)
- Remove arecont-8 stream entry with [object%20Window] JS artifact in URL
- Add [TOKEN] placeholder to brand schema, README, and StrixCamDB-Add skill
- Remove [PASWORD] typo from schema and skill alternative forms list

.claude/skills/StrixCamDB-Add/SKILL.md

@@ -27,6 +27,61 @@ If the user provided details in the command arguments -- parse them and determin
 1. **Add new brand** -- create a new JSON file for a brand that doesn't exist yet
 2. **Add stream URL** -- add a new stream entry to an existing brand
 3. **Add model to stream** -- add a model name to an existing stream's `models` array
+4. **Add OUI prefix** -- add MAC address prefix to brand mapping in `oui.json`
+5. **Process contribution issues** -- review and apply data from GitHub issues
+
+### Adding OUI prefix
+
+When user selects "Add OUI prefix":
+
+1. Ask for MAC prefix (e.g. `3C:EF:8C`) and brand name (e.g. `Dahua`)
+2. Multiple entries can be added at once
+3. Normalize prefix to uppercase: `3c:ef:8c` -> `3C:EF:8C`
+4. Validate format: must be `XX:XX:XX` (uppercase hex, colon-separated)
+5. Read `oui.json`, check if prefix already exists -- if yes, warn and show current mapping
+6. Add new entries, sort keys alphabetically
+7. Write back with 2-space indent, `ensure_ascii: false`, trailing newline
+8. Verify: `python3 -c "import json; json.load(open('oui.json'))"`
+
+**OUI file format** (`oui.json` in repository root):
+
+```json
+{
+  "3C:EF:8C": "Dahua",
+  "44:47:CC": "Hikvision"
+}
+```
+
+Key: MAC prefix (first 3 octets). Value: brand name (human-readable).
+
+### Processing contribution issues
+
+When user selects "Process contribution issues":
+
+1. Run `gh issue list --repo eduard256/StrixCamDB --label contribution --state open` to list pending contributions
+2. Show the list to the user
+3. For each issue the user wants to process:
+   a. Run `gh issue view {number} --repo eduard256/StrixCamDB` to read the YAML data
+   b. Parse the YAML block from the issue body:
+      ```yaml
+      brand: Dahua
+      model: IPC-HDW1220S
+      url: /live
+      protocol: rtsp
+      port: 554
+      mac_prefix: 3C:EF:8C
+      comment: Works on firmware v2.800
+      ```
+   c. Validate the data:
+      - Is the protocol known? If not -- warn the user, suggest `/StrixCamDB-New-Protocol-Or-Placeholders`
+      - Does the brand file exist? If not -- this is "Add new brand" operation
+      - Is this URL already in the brand file? If yes -- warn about duplicate
+      - Does the model look suspicious? Warn but don't block
+   d. Apply the data using the normal add flow (STEP 3-5 below)
+   e. After successful commit, close the issue:
+      `gh issue close {number} --repo eduard256/StrixCamDB --comment "Added to database"`
+   f. If the data is invalid or rejected by user:
+      `gh issue close {number} --repo eduard256/StrixCamDB --reason "not planned" --comment "Rejected: {reason}"`
 
 ---
 
@@ -45,7 +100,7 @@ Brand ID is auto-generated from brand name: lowercase, spaces to hyphens, specia
 Ask (or parse from input):
 - Brand name or brand_id (search in `brands/` directory if unclear)
 - URL path (e.g. `/Streaming/Channels/101`)
-- Protocol (`rtsp`, `http`, `https`, `rtsps`, `rtmp`, `mms`, `bubble`, `rtp`)
+- Protocol (`rtsp`, `http`, `https`, `rtsps`, `rtmp`, `mms`, `bubble`, `rtp`, `dvrip`)
 - Port number (e.g. `554`, `80`. Use `0` if unknown)
 - Which models this stream works for (list of model names, or `*` for all)
 
@@ -97,7 +152,7 @@ Every brand file is `brands/{brand_id}.json`:
 |-------|------|----------|-------|
 | `id` | string | yes | Format: `{brand_id}-{N}` where N is sequential. Must be unique within file |
 | `url` | string | yes | URL path only (no protocol://host:port prefix). Can contain placeholders |
-| `protocol` | string | yes | One of: `rtsp`, `http`, `https`, `rtsps`, `rtmp`, `mms`, `bubble`, `rtp` |
+| `protocol` | string | yes | One of: `rtsp`, `http`, `https`, `rtsps`, `rtmp`, `mms`, `bubble`, `rtp`, `dvrip` |
 | `port` | int | yes | 0-65535. Use `0` if unknown (means "use default for protocol") |
 | `models` | array | yes | Non-empty. Use `["*"]` if stream works for all models of this brand |
 | `notes` | string | no | Only add if genuinely useful context exists |
@@ -115,8 +170,9 @@ Every brand file is `brands/{brand_id}.json`:
 | `[IP]` | Camera IP address | `192.168.1.100` |
 | `[PORT]` | Port number | `554` |
 | `[AUTH]` | Base64-encoded `username:password` | |
+| `[TOKEN]` | Authorization token | |
 
-Alternative forms: `[USER]`, `[PASS]`, `[PWD]`, `[PASWORD]`, `{CHANNEL}`, `{channel+1}` -- all supported.
+Alternative forms: `[USER]`, `[PASS]`, `[PWD]`, `{CHANNEL}`, `{channel+1}` -- all supported.
 
 ### Validation rules
 

.claude/skills/StrixCamDB-New-Protocol-Or-Placeholders/SKILL.md

@@ -13,6 +13,41 @@ Chat with the user in Russian. All file content -- in English.
 
 ---
 
+## STEP 0: Check GitHub issues
+
+On every invocation, BEFORE asking the user anything:
+
+1. Run `gh issue list --repo eduard256/StrixCamDB --label new-protocol --state open`
+2. Run `gh issue list --repo eduard256/StrixCamDB --label new-placeholder --state open`
+3. If there are open issues -- show them to the user and ask which one to work on
+4. If user picks an issue -- run `gh issue view {number} --repo eduard256/StrixCamDB` and parse the data:
+
+**Protocol issue format:**
+```yaml
+protocol: bubble
+default_port: 80
+url_format: /bubble/live?ch={channel}&stream={subtype}
+```
+Plus free-text sections: Description, Known brands, URL patterns, Where to research, Notes.
+
+**Placeholder issue format:**
+```yaml
+placeholder: "[STREAM]"
+alternatives: ["{stream}", "[STREAM_ID]"]
+description: "Stream profile index (0=main, 1=sub)"
+example_values: ["0", "1", "2"]
+```
+Plus free-text sections: Description, URL examples, Known brands using this, Notes.
+
+5. Use parsed data to pre-fill STEP 2 (don't ask what the user already provided in the issue)
+6. Read the "Where to research" section and investigate those sources before adding
+7. After successful push, close the issue:
+   `gh issue close {number} --repo eduard256/StrixCamDB --comment "Added to database"`
+
+If no open issues or user wants to add manually -- proceed to STEP 1.
+
+---
+
 ## STEP 1: Determine the operation
 
 If the user provided details in the command arguments -- parse them. If not -- ask using AskUserQuestion:

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - "brands/**"
       - "presets/**"
+      - "oui.json"
       - "scripts/build_sqlite.py"
       - "scripts/generate_presets.py"
       - ".github/workflows/build.yml"

README.md

@@ -1,6 +1,8 @@
 # StrixCamDB
 
-Open database of IP camera stream URLs. 3600+ brands - from Hikvision to AliExpress no-name cameras. Primarily used in [Strix](https://github.com/eduard256/Strix), but can be used in any project.
+Open database of IP camera stream URLs. 3600+ brands -- from Hikvision to AliExpress no-name cameras. Primarily used in [Strix](https://github.com/eduard256/Strix), but can be used in any project.
+
+**Want to add a camera?** Use the [contribution form](https://gostrix.github.io/#/contribute).
 
 ## Database Format
 
@@ -36,7 +38,7 @@ Each brand is a separate JSON file in `brands/` directory. Filename matches `bra
 |-------|------|-------------|
 | `id` | string | Unique within brand |
 | `url` | string | URL path with placeholders |
-| `protocol` | string | `rtsp`, `http`, `https`, `rtsps`, `rtmp`, `mms`, `bubble`, `rtp` |
+| `protocol` | string | `rtsp`, `http`, `https`, `rtsps`, `rtmp`, `mms`, `bubble`, `rtp`, `dvrip` |
 | `port` | int | Port number. `0` = unknown, use default for protocol |
 | `models` | array | Camera models. `["*"]` = works for all models of this brand |
 | `notes` | string | Optional. Human-readable notes |
@@ -56,6 +58,7 @@ URL paths can contain placeholders. The application replaces them before making
 | `[IP]` | Camera IP address |
 | `[PORT]` | Port number |
 | `[AUTH]` | Base64-encoded `username:password` |
+| `[TOKEN]` | Authorization token |
 
 Alternative forms are also supported: `[USER]`, `[PASS]`, `[PWD]`, `{CHANNEL}`, `{channel+1}`, etc.
 
@@ -89,6 +92,17 @@ Available in `presets/` directory:
 
 `brand_count` -- number of brands that use this URL pattern.
 
+## OUI Database
+
+`oui.json` maps MAC address prefixes to camera brands. Used for auto-detecting camera brand by MAC address during network scanning. 2400+ entries.
+
+```json
+{
+  "3C:EF:8C": "Dahua",
+  "44:47:CC": "Hikvision"
+}
+```
+
 ## SQLite
 
 Pre-built `cameras.db` is available in [GitHub Releases](https://github.com/eduard256/StrixCamDB/releases). Updated automatically on every push to `main`.
@@ -107,6 +121,7 @@ streams (id, brand_id, stream_id, url, protocol, port, notes)
 stream_models (stream_id, model)
 presets (id, preset_id, name, description)
 preset_streams (id, preset_id, url, protocol, port, notes, brand_count)
+oui (prefix, brand)
 meta (key, value)
 ```
 
@@ -123,6 +138,9 @@ JOIN streams s ON s.id = sm.stream_id
 JOIN brands b ON b.brand_id = s.brand_id
 WHERE sm.model = 'DCS-930L';
 
+-- Detect brand by MAC address
+SELECT brand FROM oui WHERE prefix = '44:47:CC';
+
 -- Top 10 most popular URL patterns
 SELECT url, brand_count FROM preset_streams
 WHERE preset_id = 'top-150'

brands/9trading.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "9Trading",
+  "brand_id": "9trading",
+  "streams": [
+    {
+      "id": "9trading-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "9trading-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/a-zone.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "A-ZONE",
+  "brand_id": "a-zone",
+  "streams": [
+    {
+      "id": "a-zone-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "a-zone-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/abowone.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Abowone",
+  "brand_id": "abowone",
+  "streams": [
+    {
+      "id": "abowone-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "abowone-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/ahwvse.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "AHWVSE",
+  "brand_id": "ahwvse",
+  "streams": [
+    {
+      "id": "ahwvse-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "ahwvse-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/ali-express.json

@@ -98,6 +98,15 @@
       "models": [
         "wy0530"
       ]
+    },
+    {
+      "id": "ali-express-11",
+      "url": "/live",
+      "protocol": "rtsp",
+      "port": 554,
+      "models": [
+        "V380"
+      ]
     }
   ]
 }

brands/amcrest.json

@@ -417,6 +417,7 @@
         "IP5M_T1179EB-28MM",
         "IP5M_T1179EW",
         "IP5m-B1186EB",
+        "IP5M-B1186EW",
         "IP5M-B1276EW-AI",
         "IP5M-F1180EW-V2",
         "IP5M-T1179EW 28MM",

brands/amorvue.json

@@ -54,6 +54,26 @@
       "models": [
         "RC720AW"
       ]
+    },
+    {
+      "id": "amorvue-6",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - ESeeCloud/dvr163 NVR firmware"
+    },
+    {
+      "id": "amorvue-7",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - ESeeCloud/dvr163 NVR firmware"
     }
   ]
 }

brands/annke.json

@@ -41,33 +41,23 @@
     },
     {
       "id": "annke-5",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
+        "*"
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "annke-6",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
+        "*"
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "annke-7",

brands/anran.json

@@ -551,6 +551,46 @@
       "models": [
         "wifi_1080p"
       ]
+    },
+    {
+      "id": "anran-35",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "anran-36",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "anran-37",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "anran-38",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/arecont.json

@@ -239,17 +239,6 @@
         "Vision"
       ]
     },
-    {
-      "id": "arecont-8",
-      "url": "/image?res=full&x0=0%25&y0=[object%20Window]%25&x1=100%25&y1=100%25&quality=21&doublescan=0",
-      "protocol": "http",
-      "port": 80,
-      "models": [
-        "11455DN",
-        "3100",
-        "av3130"
-      ]
-    },
     {
       "id": "arecont-9",
       "url": "mjpeg[CHANNEL]?res=half&x1=0&y1=0",

brands/asecam.json

@@ -45,6 +45,26 @@
       "models": [
         "Dome 4K"
       ]
+    },
+    {
+      "id": "asecam-5",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "asecam-6",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/autoeye.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Autoeye",
+  "brand_id": "autoeye",
+  "streams": [
+    {
+      "id": "autoeye-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "autoeye-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/azishn.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "AZISHN",
+  "brand_id": "azishn",
+  "streams": [
+    {
+      "id": "azishn-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "azishn-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/besder.json

@@ -501,6 +501,46 @@
       "models": [
         "Sec"
       ]
+    },
+    {
+      "id": "besder-29",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "besder-30",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "besder-31",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "besder-32",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/bessky.json

@@ -11,6 +11,26 @@
       "models": [
         "BE-IPWB200ZW"
       ]
+    },
+    {
+      "id": "bessky-2",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "bessky-3",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/bestmo.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Bestmo",
+  "brand_id": "bestmo",
+  "streams": [
+    {
+      "id": "bestmo-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "bestmo-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/bfmore.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "BFMore",
+  "brand_id": "bfmore",
+  "streams": [
+    {
+      "id": "bfmore-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "bfmore-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/boavision.json

@@ -274,6 +274,26 @@
       "models": [
         "IP DOME"
       ]
+    },
+    {
+      "id": "boavision-22",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "boavision-23",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/bulwark.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "BULWARK",
+  "brand_id": "bulwark",
+  "streams": [
+    {
+      "id": "bulwark-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "bulwark-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/canavis.json

@@ -32,6 +32,26 @@
       "models": [
         "ca-wl672-1p1m"
       ]
+    },
+    {
+      "id": "canavis-4",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "canavis-5",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/cisco.json

@@ -131,20 +131,6 @@
         "WVC80N"
       ]
     },
-    {
-      "id": "cisco-7",
-      "url": "[code]",
-      "protocol": "rtsp",
-      "port": 0,
-      "models": [
-        "2500 IP CAMERA",
-        "Other",
-        "PVC2300",
-        "VC240",
-        "WVC SERIES",
-        "WVC210"
-      ]
-    },
     {
       "id": "cisco-8",
       "url": "img/mjpeg.cgi",
@@ -392,16 +378,6 @@
         "WVC2300"
       ]
     },
-    {
-      "id": "cisco-29",
-      "url": "/[code]",
-      "protocol": "rtsp",
-      "port": 554,
-      "models": [
-        "PVC2300",
-        "PVC300"
-      ]
-    },
     {
       "id": "cisco-30",
       "url": "video.mjpg",

brands/cwh.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "CWH",
+  "brand_id": "cwh",
+  "streams": [
+    {
+      "id": "cwh-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "cwh-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/dagro.json

@@ -49,6 +49,26 @@
       "models": [
         "Other"
       ]
+    },
+    {
+      "id": "dagro-6",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "dagro-7",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/dahua.json

@@ -2146,7 +2146,6 @@
         "N42BJ62",
         "Portail",
         "tobeupdated",
-        "Unlisted [UNSERE!]",
         "XVR"
       ]
     },

brands/datocctv.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "datocctv",
+  "brand_id": "datocctv",
+  "streams": [
+    {
+      "id": "datocctv-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "datocctv-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/defeway.json

@@ -124,6 +124,26 @@
       "models": [
         "Other"
       ]
+    },
+    {
+      "id": "defeway-13",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "defeway-14",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/digoo.json

@@ -240,6 +240,26 @@
       "models": [
         "Other"
       ]
+    },
+    {
+      "id": "digoo-20",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "digoo-21",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/diysecuritycameraworld.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "DiySecurityCameraWorld",
+  "brand_id": "diysecuritycameraworld",
+  "streams": [
+    {
+      "id": "diysecuritycameraworld-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "diysecuritycameraworld-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/donphia.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "DONPHIA",
+  "brand_id": "donphia",
+  "streams": [
+    {
+      "id": "donphia-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "donphia-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/enklov.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "ENKLOV",
+  "brand_id": "enklov",
+  "streams": [
+    {
+      "id": "enklov-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "enklov-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/esamact.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "ESAMACT",
+  "brand_id": "esamact",
+  "streams": [
+    {
+      "id": "esamact-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "esamact-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/escam.json

@@ -687,6 +687,26 @@
       "models": [
         "WNK404"
       ]
+    },
+    {
+      "id": "escam-46",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "escam-47",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/eufy.json

@@ -101,15 +101,6 @@
     },
     {
       "id": "eufy-4",
-      "url": "D:/",
-      "protocol": "file",
-      "port": 0,
-      "models": [
-        "Cam2c"
-      ]
-    },
-    {
-      "id": "eufy-5",
       "url": "/",
       "protocol": "https",
       "port": 443,
@@ -124,7 +115,7 @@
       ]
     },
     {
-      "id": "eufy-6",
+      "id": "eufy-5",
       "url": "/live3",
       "protocol": "rtsp",
       "port": 0,
@@ -134,7 +125,7 @@
       ]
     },
     {
-      "id": "eufy-7",
+      "id": "eufy-6",
       "url": "/live4",
       "protocol": "rtsp",
       "port": 0,
@@ -143,7 +134,7 @@
       ]
     },
     {
-      "id": "eufy-8",
+      "id": "eufy-7",
       "url": "/img/video.asf",
       "protocol": "mms",
       "port": 554,
@@ -157,7 +148,7 @@
       ]
     },
     {
-      "id": "eufy-9",
+      "id": "eufy-8",
       "url": "/11",
       "protocol": "rtsp",
       "port": 554,
@@ -166,7 +157,7 @@
       ]
     },
     {
-      "id": "eufy-10",
+      "id": "eufy-9",
       "url": "/mjpg/video.mjpg",
       "protocol": "http",
       "port": 10002,
@@ -175,7 +166,7 @@
       ]
     },
     {
-      "id": "eufy-11",
+      "id": "eufy-10",
       "url": "/img/media.sav",
       "protocol": "rtsp",
       "port": 554,
@@ -184,7 +175,7 @@
       ]
     },
     {
-      "id": "eufy-12",
+      "id": "eufy-11",
       "url": "/live0.264",
       "protocol": "rtsp",
       "port": 554,
@@ -193,7 +184,7 @@
       ]
     },
     {
-      "id": "eufy-13",
+      "id": "eufy-12",
       "url": "/0",
       "protocol": "rtsp",
       "port": 554,
@@ -202,13 +193,22 @@
       ]
     },
     {
-      "id": "eufy-14",
+      "id": "eufy-13",
       "url": "/videostream.cgi?user=[USERNAME]&pwd=[PASSWORD]",
       "protocol": "http",
       "port": 554,
       "models": [
         "T8410"
       ]
+    },
+    {
+      "id": "eufy-14",
+      "url": "/live",
+      "protocol": "rtsp",
+      "port": 554,
+      "models": [
+        "Solo 2k"
+      ]
     }
   ]
 }

brands/evtevision.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "EVTEVISION",
+  "brand_id": "evtevision",
+  "streams": [
+    {
+      "id": "evtevision-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "evtevision-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/fayele.json

@@ -42,6 +42,26 @@
         "ndr-6402-530x",
         "Other"
       ]
+    },
+    {
+      "id": "fayele-5",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "fayele-6",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/floureon.json

@@ -5,33 +5,23 @@
   "streams": [
     {
       "id": "floureon-1",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
+        "*"
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "floureon-2",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
+        "*"
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "floureon-3",
@@ -650,6 +640,26 @@
       "models": [
         "XF-A2528F-ZW"
       ]
+    },
+    {
+      "id": "floureon-50",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "floureon-51",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/funi.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Funi",
+  "brand_id": "funi",
+  "streams": [
+    {
+      "id": "funi-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "funi-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/gadinan.json

@@ -42,6 +42,46 @@
       "models": [
         "pk1100"
       ]
+    },
+    {
+      "id": "gadinan-5",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "gadinan-6",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "gadinan-7",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "gadinan-8",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/garunk.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "GARUNK",
+  "brand_id": "garunk",
+  "streams": [
+    {
+      "id": "garunk-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "garunk-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/genbolt.json

@@ -210,6 +210,26 @@
       "models": [
         "tit"
       ]
+    },
+    {
+      "id": "genbolt-14",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "genbolt-15",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }

brands/h.264-network-dvr.json

@@ -26,7 +26,7 @@
         "H.264",
         "H264",
         "IP54",
-        "LS-F2{HX}",
+        "LS-F2",
         "Other",
         "V4.02.R11.60426094.12000"
       ]

brands/hamrol.json

@@ -27,6 +27,26 @@
         "EO Hamrol PTZ_2NVT",
         "NVT"
       ]
+    },
+    {
+      "id": "hamrol-3",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "hamrol-4",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/hamrolte.json

@@ -49,6 +49,46 @@
       "models": [
         "HKBQ15L-I50"
       ]
+    },
+    {
+      "id": "hamrolte-6",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "hamrolte-7",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "hamrolte-8",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "hamrolte-9",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/highfly.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Highfly",
+  "brand_id": "highfly",
+  "streams": [
+    {
+      "id": "highfly-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "highfly-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/hiseeu.json

@@ -465,6 +465,46 @@
       "models": [
         "WHD812B"
       ]
+    },
+    {
+      "id": "hiseeu-37",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "hiseeu-38",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "hiseeu-39",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "hiseeu-40",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/hisvision.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "HISVISION",
+  "brand_id": "hisvision",
+  "streams": [
+    {
+      "id": "hisvision-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "hisvision-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/hmqc.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "HMQC",
+  "brand_id": "hmqc",
+  "streams": [
+    {
+      "id": "hmqc-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "hmqc-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/icsee.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "ICSee",
+  "brand_id": "icsee",
+  "streams": [
+    {
+      "id": "icsee-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "icsee-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/ihomeguard.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "IHOMEGUARD",
+  "brand_id": "ihomeguard",
+  "streams": [
+    {
+      "id": "ihomeguard-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "ihomeguard-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/isseusee.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "ISSEUSEE",
+  "brand_id": "isseusee",
+  "streams": [
+    {
+      "id": "isseusee-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "isseusee-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/itooner.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "iTooner",
+  "brand_id": "itooner",
+  "streams": [
+    {
+      "id": "itooner-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "itooner-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/jennov.json

@@ -284,6 +284,26 @@
       "models": [
         "ptz"
       ]
+    },
+    {
+      "id": "jennov-24",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "jennov-25",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/jooan.json

@@ -346,6 +346,26 @@
       "models": [
         "W8-U"
       ]
+    },
+    {
+      "id": "jooan-25",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "jooan-26",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/jshida.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Jshida",
+  "brand_id": "jshida",
+  "streams": [
+    {
+      "id": "jshida-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "jshida-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/juesenwdm.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "JUESENWDM",
+  "brand_id": "juesenwdm",
+  "streams": [
+    {
+      "id": "juesenwdm-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "juesenwdm-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/jufeng.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "JUFENG",
+  "brand_id": "jufeng",
+  "streams": [
+    {
+      "id": "jufeng-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "jufeng-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/jztek.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "JZTEK",
+  "brand_id": "jztek",
+  "streams": [
+    {
+      "id": "jztek-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "jztek-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/kerui.json

@@ -39,6 +39,26 @@
       "models": [
         "CIPC-GQC09HE"
       ]
+    },
+    {
+      "id": "kerui-5",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "kerui-6",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/kkmoon.json

@@ -519,6 +519,26 @@
       "models": [
         "xf9608nf"
       ]
+    },
+    {
+      "id": "kkmoon-32",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "kkmoon-33",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/kojima.json

@@ -0,0 +1,21 @@
+{
+  "version": 2,
+  "brand": "Kojima",
+  "brand_id": "kojima",
+  "streams": [
+    {
+      "id": "kojima-1",
+      "url": "/stream0",
+      "protocol": "rtsp",
+      "port": 8554,
+      "models": ["ssc-3mp-2k"]
+    },
+    {
+      "id": "kojima-2",
+      "url": "/stream1",
+      "protocol": "rtsp",
+      "port": 8554,
+      "models": ["ssc-3mp-2k"]
+    }
+  ]
+}

brands/konlen.json

@@ -32,6 +32,26 @@
       "models": [
         "KL-X624GAW"
       ]
+    },
+    {
+      "id": "konlen-4",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "konlen-5",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/kopda.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Kopda",
+  "brand_id": "kopda",
+  "streams": [
+    {
+      "id": "kopda-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "kopda-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/lenyes.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Lenyes",
+  "brand_id": "lenyes",
+  "streams": [
+    {
+      "id": "lenyes-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "lenyes-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/leshp.json

@@ -69,6 +69,26 @@
         "X001JCKQ9T",
         "X001JCKQ9T #2"
       ]
+    },
+    {
+      "id": "leshp-8",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "leshp-9",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/levcoecam.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "LEVCOECAM",
+  "brand_id": "levcoecam",
+  "streams": [
+    {
+      "id": "levcoecam-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "levcoecam-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/lingsee.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "LINGSEE",
+  "brand_id": "lingsee",
+  "streams": [
+    {
+      "id": "lingsee-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "lingsee-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/loosafe.json

@@ -226,6 +226,26 @@
         "LS-W-IPC1",
         "LS-W-IPC4"
       ]
+    },
+    {
+      "id": "loosafe-18",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "loosafe-19",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/miebul.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "MIEBUL",
+  "brand_id": "miebul",
+  "streams": [
+    {
+      "id": "miebul-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "miebul-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/misecu.json

@@ -69,6 +69,26 @@
       "models": [
         "IPC-DM13EW-1.3"
       ]
+    },
+    {
+      "id": "misecu-6",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "misecu-7",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/nextrend.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Nextrend",
+  "brand_id": "nextrend",
+  "streams": [
+    {
+      "id": "nextrend-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "nextrend-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/oloey.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "OLOEY",
+  "brand_id": "oloey",
+  "streams": [
+    {
+      "id": "oloey-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "oloey-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/ouertech.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "OUERTECH",
+  "brand_id": "ouertech",
+  "streams": [
+    {
+      "id": "ouertech-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "ouertech-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/qntsq.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "QNTSQ",
+  "brand_id": "qntsq",
+  "streams": [
+    {
+      "id": "qntsq-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "qntsq-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/rehent.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Rehent",
+  "brand_id": "rehent",
+  "streams": [
+    {
+      "id": "rehent-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "rehent-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/sacam.json

@@ -25,6 +25,26 @@
         "p2p hd",
         "SW27897964"
       ]
+    },
+    {
+      "id": "sacam-3",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sacam-4",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/sannce.json

@@ -5,33 +5,23 @@
   "streams": [
     {
       "id": "sannce-1",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
+        "*"
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "sannce-2",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
+        "*"
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "sannce-3",
@@ -391,6 +381,26 @@
       "models": [
         "PTZ CAMERA"
       ]
+    },
+    {
+      "id": "sannce-36",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sannce-37",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/sansco.json

@@ -61,6 +61,26 @@
       "models": [
         "Other"
       ]
+    },
+    {
+      "id": "sansco-7",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sansco-8",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/sectec.json

@@ -56,6 +56,26 @@
       "models": [
         "ST-IP573F"
       ]
+    },
+    {
+      "id": "sectec-6",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sectec-7",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/sifvision.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Sifvision",
+  "brand_id": "sifvision",
+  "streams": [
+    {
+      "id": "sifvision-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sifvision-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/simicam.json

@@ -61,6 +61,26 @@
       "models": [
         "QJ-8M-P"
       ]
+    },
+    {
+      "id": "simicam-7",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "simicam-8",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/smar.json

@@ -56,6 +56,26 @@
       "models": [
         "WN1908F"
       ]
+    },
+    {
+      "id": "smar-7",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "smar-8",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/smartwares.json

@@ -190,6 +190,26 @@
       "models": [
         "CP35IP"
       ]
+    },
+    {
+      "id": "smartwares-16",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - confirmed on CIP-39220"
+    },
+    {
+      "id": "smartwares-17",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - confirmed on CIP-39220"
     }
   ]
 }

brands/smtsec.json

@@ -13,6 +13,26 @@
         "SIP-E0312-178D",
         "UNLISTED"
       ]
+    },
+    {
+      "id": "smtsec-2",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "smtsec-3",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/sricam.json

@@ -936,6 +936,26 @@
       "models": [
         "SRICAM AP006"
       ]
+    },
+    {
+      "id": "sricam-58",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sricam-59",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/ssicon.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "SSICON",
+  "brand_id": "ssicon",
+  "streams": [
+    {
+      "id": "ssicon-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "ssicon-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/sunba.json

@@ -156,6 +156,26 @@
       "models": [
         "robot"
       ]
+    },
+    {
+      "id": "sunba-15",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sunba-16",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/sunivision.json

@@ -51,6 +51,26 @@
       "models": [
         "Other"
       ]
+    },
+    {
+      "id": "sunivision-6",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "sunivision-7",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/susikum.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Susikum",
+  "brand_id": "susikum",
+  "streams": [
+    {
+      "id": "susikum-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "susikum-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/tecbox.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "TECBOX",
+  "brand_id": "tecbox",
+  "streams": [
+    {
+      "id": "tecbox-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "tecbox-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/techage.json

@@ -183,6 +183,26 @@
       "models": [
         "vm-530"
       ]
+    },
+    {
+      "id": "techage-16",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "techage-17",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/techege.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Techege",
+  "brand_id": "techege",
+  "streams": [
+    {
+      "id": "techege-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "techege-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/tianxun.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "TianAnXun",
+  "brand_id": "tianxun",
+  "streams": [
+    {
+      "id": "tianxun-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "tianxun-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/tmezon.json

@@ -89,6 +89,26 @@
       "models": [
         "Other"
       ]
+    },
+    {
+      "id": "tmezon-9",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "tmezon-10",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/tvpsii.json

@@ -11,6 +11,26 @@
       "models": [
         "TP-PTZ08W"
       ]
+    },
+    {
+      "id": "tvpsii-2",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "tvpsii-3",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }

brands/unique-vision.json

@@ -0,0 +1,27 @@
+{
+  "version": 2,
+  "brand": "Unique Vision",
+  "brand_id": "unique-vision",
+  "streams": [
+    {
+      "id": "unique-vision-1",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "unique-vision-2",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
+    }
+  ]
+}

brands/unitoptek.json

@@ -24,6 +24,26 @@
         "HX-PC28041080A",
         "Other"
       ]
+    },
+    {
+      "id": "unitoptek-3",
+      "url": "?channel=[CHANNEL]&subtype=0",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia main stream (Xiongmai-based firmware)"
+    },
+    {
+      "id": "unitoptek-4",
+      "url": "?channel=[CHANNEL]&subtype=1",
+      "protocol": "dvrip",
+      "port": 34567,
+      "models": [
+        "*"
+      ],
+      "notes": "DVR-IP/Sofia sub stream (Xiongmai-based firmware)"
     }
   ]
 }