Stream: Only add base url when needed (#21979)

homeassistant/components/camera/__init__.py

@@ -566,7 +566,7 @@ async def async_handle_play_stream_service(camera, service_call):
     url = request_stream(hass, camera.stream_source, fmt=fmt)
     data = {
         ATTR_ENTITY_ID: entity_ids,
-        ATTR_MEDIA_CONTENT_ID: url,
+        ATTR_MEDIA_CONTENT_ID: "{}{}".format(hass.config.api.base_url, url),
         ATTR_MEDIA_CONTENT_TYPE: FORMAT_CONTENT_TYPE[fmt]
     }
 

homeassistant/components/stream/__init__.py

@@ -59,7 +59,7 @@ def request_stream(hass, stream_source, *, fmt='hls',
             stream.access_token = generate_secret()
             stream.start()
         return hass.data[DOMAIN][ATTR_ENDPOINTS][fmt].format(
-            hass.config.api.base_url, stream.access_token)
+            stream.access_token)
     except Exception:
         raise HomeAssistantError('Unable to get stream')
 

homeassistant/components/stream/hls.py

@@ -18,7 +18,7 @@ def async_setup_hls(hass):
     """Set up api endpoints."""
     hass.http.register_view(HlsPlaylistView())
     hass.http.register_view(HlsSegmentView())
-    return '{}/api/hls/{}/playlist.m3u8'
+    return '/api/hls/{}/playlist.m3u8'
 
 
 class HlsPlaylistView(StreamView):