From 225a9ee5f30bc95a2221a44e3675fdaf1c9c25fc Mon Sep 17 00:00:00 2001
From: uvjustin <46082645+uvjustin@users.noreply.github.com>
Date: Mon, 3 Jan 2022 03:55:19 +0800
Subject: [PATCH] Update generic with no still_image_url option (#20862)

---
 source/_integrations/generic.markdown | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/source/_integrations/generic.markdown b/source/_integrations/generic.markdown
index 4cb5701a424..34c7714f230 100644
--- a/source/_integrations/generic.markdown
+++ b/source/_integrations/generic.markdown
@@ -28,11 +28,11 @@ camera:
 
 {% configuration %}
 still_image_url:
-  description: "The URL your camera serves the image on, e.g., `http://192.168.1.21:2112/`. Can be a [template](/topics/templating/)."
-  required: true
+  description: "The URL your camera serves the image on, e.g., `http://192.168.1.21:2112/`. Can be a [template](/topics/templating/). At least one of still_image_url or stream_source must be provided."
+  required: false
   type: string
 stream_source:
-  description: "The URL your camera serves the live stream on, e.g., `rtsp://192.168.1.21:554/`. Can be a [template](/topics/templating/)."
+  description: "The URL your camera serves the live stream on, e.g., `rtsp://user:pass@192.168.1.21:554/`. Can be a [template](/topics/templating/). Usernames and passwords must be embedded in the URL. At least one of still_image_url or stream_source must be provided."
   required: false
   type: string
 name:
@@ -40,11 +40,11 @@ name:
   required: false
   type: string
 username:
-  description: The username for accessing your camera.
+  description: The username for accessing your camera. Note that this username applies only to still_image_url and not to stream_source.
   required: false
   type: string
 password:
-  description: The password for accessing your camera.
+  description: The password for accessing your camera. Note that this password applies only to still_image_url and not to stream_source.
   required: false
   type: string
 authentication:
@@ -121,6 +121,7 @@ camera:
     name: Host instance camera feed
     still_image_url: https://127.0.0.5:8123/api/camera_proxy/camera.live_view
 ```
+
 ### Image from HTTP only camera
 
 To access a camera which is only available via HTTP, you must turn off SSL verification.
@@ -142,7 +143,18 @@ camera:
   - platform: generic
     name: Streaming Enabled
     still_image_url: http://194.218.96.92/jpg/image.jpg
-    stream_source: rtsp://194.218.96.92:554
+    username: user
+    password: pass
+    stream_source: rtsp://user:pass@194.218.96.92:554
+```
+
+If a camera only has a live stream URL and no snapshot URL, the [stream](/integrations/stream/) component can also generate still images from the live stream URL.
+
+```yaml
+camera:
+  - platform: generic
+    name: Streaming
+    stream_source: rtsp://user:pass@194.218.96.92:554
 ```
 
 ### Secured access to the camera