Update streamlit-webrtc to 0.51.0 and delete sample_utils.turn

app.py

@@ -15,7 +15,6 @@ import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
 from sample_utils.download import download_file
-from sample_utils.turn import get_ice_servers
 
 HERE = Path(__file__).parent
 ROOT = HERE
@@ -93,7 +92,10 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
 
     # Run inference
     blob = cv2.dnn.blobFromImage(
-        cv2.resize(image, (300, 300)), 0.007843, (300, 300), 127.5
+        image=cv2.resize(image, (300, 300)),
+        scalefactor=0.007843,
+        size=(300, 300),
+        mean=(127.5, 127.5, 127.5),
     )
     net.setInput(blob)
     output = net.forward()
@@ -138,7 +140,6 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
 webrtc_ctx = webrtc_streamer(
     key="object-detection",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
     video_frame_callback=video_frame_callback,
     media_stream_constraints={"video": True, "audio": False},
     async_processing=True,

pages/.isort.cfg

@@ -1,3 +0,0 @@
-[settings]
-profile=black
-known_third_party=streamlit_webrtc

pages/10_sendonly_audio.py

@@ -11,8 +11,6 @@ import pydub
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 logger = logging.getLogger(__name__)
 
 
@@ -20,7 +18,6 @@ webrtc_ctx = webrtc_streamer(
     key="sendonly-audio",
     mode=WebRtcMode.SENDONLY,
     audio_receiver_size=256,
-    rtc_configuration={"iceServers": get_ice_servers()},
     media_stream_constraints={"audio": True},
 )
 

pages/11_programatic_control_playing.py

@@ -3,13 +3,10 @@
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 playing = st.checkbox("Playing", value=True)
 
 webrtc_streamer(
     key="programatic_control",
     desired_playing_state=playing,
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
 )

pages/12_media_constraints_configs.py

@@ -3,13 +3,10 @@
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 frame_rate = 5
 webrtc_streamer(
     key="media-constraints",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
     media_stream_constraints={
         "video": {"frameRate": {"ideal": frame_rate}},
     },

pages/13_ui_texts_customization.py

@@ -1,10 +1,7 @@
 from streamlit_webrtc import webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 webrtc_streamer(
     key="custom_ui_texts",
-    rtc_configuration={"iceServers": get_ice_servers()},
     translations={
         "start": "開始",
         "stop": "停止",

pages/1_object_detection.py

@@ -15,7 +15,6 @@ import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
 from sample_utils.download import download_file
-from sample_utils.turn import get_ice_servers
 
 HERE = Path(__file__).parent
 ROOT = HERE.parent
@@ -93,7 +92,10 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
 
     # Run inference
     blob = cv2.dnn.blobFromImage(
-        cv2.resize(image, (300, 300)), 0.007843, (300, 300), 127.5
+        image=cv2.resize(image, (300, 300)),
+        scalefactor=0.007843,
+        size=(300, 300),
+        mean=(127.5, 127.5, 127.5),
     )
     net.setInput(blob)
     output = net.forward()
@@ -138,7 +140,6 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
 webrtc_ctx = webrtc_streamer(
     key="object-detection",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
     video_frame_callback=video_frame_callback,
     media_stream_constraints={"video": True, "audio": False},
     async_processing=True,

pages/2_opencv_filters.py

@@ -5,8 +5,6 @@ import cv2
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 _type = st.radio("Select transform type", ("noop", "cartoon", "edges", "rotate"))
 
 
@@ -51,7 +49,6 @@ def callback(frame: av.VideoFrame) -> av.VideoFrame:
 webrtc_streamer(
     key="opencv-filter",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
     video_frame_callback=callback,
     media_stream_constraints={"video": True, "audio": False},
     async_processing=True,

pages/3_audio_filter.py

@@ -4,8 +4,6 @@ import pydub
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 gain = st.slider("Gain", -10.0, +20.0, 1.0, 0.05)
 
 
@@ -34,7 +32,6 @@ def process_audio(frame: av.AudioFrame) -> av.AudioFrame:
 webrtc_streamer(
     key="audio-filter",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
     audio_frame_callback=process_audio,
     async_processing=True,
 )

pages/4_delayed_echo.py

@@ -6,8 +6,6 @@ import av
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 logger = logging.getLogger(__name__)
 
 
@@ -36,7 +34,6 @@ async def queued_audio_frames_callback(
 webrtc_streamer(
     key="delay",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration={"iceServers": get_ice_servers()},
     queued_video_frames_callback=queued_video_frames_callback,
     queued_audio_frames_callback=queued_audio_frames_callback,
     async_processing=True,

pages/5_fork_multi_outputs.py

@@ -10,8 +10,6 @@ import cv2
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 st.markdown(
     """
 Fork one input to multiple outputs with different video filters.
@@ -62,13 +60,10 @@ def make_video_frame_callback(_type: VideoFilterType):
     return callback
 
 
-COMMON_RTC_CONFIG = {"iceServers": get_ice_servers()}
-
 st.header("Input")
 ctx = webrtc_streamer(
     key="loopback",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration=COMMON_RTC_CONFIG,
     media_stream_constraints={"video": True, "audio": False},
 )
 
@@ -85,7 +80,6 @@ webrtc_streamer(
     video_frame_callback=callback,
     source_video_track=ctx.output_video_track,
     desired_playing_state=ctx.state.playing,
-    rtc_configuration=COMMON_RTC_CONFIG,
     media_stream_constraints={"video": True, "audio": False},
 )
 
@@ -102,6 +96,5 @@ webrtc_streamer(
     video_frame_callback=callback,
     source_video_track=ctx.output_video_track,
     desired_playing_state=ctx.state.playing,
-    rtc_configuration=COMMON_RTC_CONFIG,
     media_stream_constraints={"video": True, "audio": False},
 )

pages/6_mix_multi_inputs.py

@@ -11,14 +11,13 @@ import cv2
 import numpy as np
 import streamlit as st
 from streamlit_webrtc import (
+    MediaStreamMixTrack,
     WebRtcMode,
     create_mix_track,
     create_process_track,
     webrtc_streamer,
 )
 
-from sample_utils.turn import get_ice_servers
-
 st.markdown(
     """
 Mix multiple inputs with different video filters into one stream.
@@ -114,13 +113,10 @@ def mixer_callback(frames: List[av.VideoFrame]) -> av.VideoFrame:
     return new_frame
 
 
-COMMON_RTC_CONFIG = {"iceServers": get_ice_servers()}
-
 st.header("Input 1")
 input1_ctx = webrtc_streamer(
     key="input1_ctx",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration=COMMON_RTC_CONFIG,
     media_stream_constraints={"video": True, "audio": False},
 )
 filter1_type = st.radio(
@@ -140,7 +136,6 @@ st.header("Input 2")
 input2_ctx = webrtc_streamer(
     key="input2_ctx",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration=COMMON_RTC_CONFIG,
     media_stream_constraints={"video": True, "audio": False},
 )
 filter2_type = st.radio(
@@ -159,7 +154,6 @@ st.header("Input 3 (no filter)")
 input3_ctx = webrtc_streamer(
     key="input3_ctx",
     mode=WebRtcMode.SENDRECV,
-    rtc_configuration=COMMON_RTC_CONFIG,
     media_stream_constraints={"video": True, "audio": False},
 )
 
@@ -168,7 +162,6 @@ mix_track = create_mix_track(kind="video", mixer_callback=mixer_callback, key="m
 mix_ctx = webrtc_streamer(
     key="mix",
     mode=WebRtcMode.RECVONLY,
-    rtc_configuration=COMMON_RTC_CONFIG,
     source_video_track=mix_track,
     desired_playing_state=input1_ctx.state.playing
     or input2_ctx.state.playing
@@ -176,9 +169,15 @@ mix_ctx = webrtc_streamer(
 )
 
 if mix_ctx.source_video_track and input1_video_process_track:
-    mix_ctx.source_video_track.add_input_track(input1_video_process_track)
+    cast(MediaStreamMixTrack, mix_ctx.source_video_track).add_input_track(
+        input1_video_process_track
+    )
 if mix_ctx.source_video_track and input2_video_process_track:
-    mix_ctx.source_video_track.add_input_track(input2_video_process_track)
+    cast(MediaStreamMixTrack, mix_ctx.source_video_track).add_input_track(
+        input2_video_process_track
+    )
 if mix_ctx.source_video_track and input3_ctx.output_video_track:
     # Input3 is sourced without any filter.
-    mix_ctx.source_video_track.add_input_track(input3_ctx.output_video_track)
+    cast(MediaStreamMixTrack, mix_ctx.source_video_track).add_input_track(
+        input3_ctx.output_video_track
+    )

pages/7_record.py

@@ -7,8 +7,6 @@ import streamlit as st
 from aiortc.contrib.media import MediaRecorder
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 
 def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
     img = frame.to_ndarray(format="bgr24")
@@ -41,7 +39,6 @@ def app():
     webrtc_streamer(
         key="record",
         mode=WebRtcMode.SENDRECV,
-        rtc_configuration={"iceServers": get_ice_servers()},
         media_stream_constraints={
             "video": True,
             "audio": True,

pages/8_media_files_streaming.py

@@ -11,7 +11,6 @@ from aiortc.contrib.media import MediaPlayer
 from streamlit_webrtc import WebRtcMode, WebRtcStreamerContext, webrtc_streamer
 
 from sample_utils.download import download_file
-from sample_utils.turn import get_ice_servers
 
 HERE = Path(__file__).parent
 ROOT = HERE.parent
@@ -114,7 +113,6 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
 webrtc_streamer(
     key=key,
     mode=WebRtcMode.RECVONLY,
-    rtc_configuration={"iceServers": get_ice_servers()},
     media_stream_constraints={
         "video": media_file_info["type"] == "video",
         "audio": media_file_info["type"] == "audio",

pages/9_sendonly_video.py

@@ -7,15 +7,12 @@ import queue
 import streamlit as st
 from streamlit_webrtc import WebRtcMode, webrtc_streamer
 
-from sample_utils.turn import get_ice_servers
-
 logger = logging.getLogger(__name__)
 
 
 webrtc_ctx = webrtc_streamer(
     key="video-sendonly",
     mode=WebRtcMode.SENDONLY,
-    rtc_configuration={"iceServers": get_ice_servers()},
     media_stream_constraints={"video": True},
 )
 

requirements.txt

@@ -1,5 +1,5 @@
 opencv-python-headless
 pydub==0.25.1
-streamlit_webrtc~=0.48.1
+streamlit_webrtc~=0.51.0
 twilio~=9.4.3
 matplotlib

sample_utils/turn.py

@@ -1,39 +0,0 @@
-import logging
-import os
-
-import streamlit as st
-from twilio.base.exceptions import TwilioRestException
-from twilio.rest import Client
-
-logger = logging.getLogger(__name__)
-
-
-def get_ice_servers():
-    """Use Twilio's TURN server because Streamlit Community Cloud has changed
-    its infrastructure and WebRTC connection cannot be established without TURN server now.  # noqa: E501
-    We considered Open Relay Project (https://www.metered.ca/tools/openrelay/) too,
-    but it is not stable and hardly works as some people reported like https://github.com/aiortc/aiortc/issues/832#issuecomment-1482420656  # noqa: E501
-    See https://github.com/whitphx/streamlit-webrtc/issues/1213
-    """
-
-    # Ref: https://www.twilio.com/docs/stun-turn/api
-    try:
-        account_sid = os.environ["TWILIO_ACCOUNT_SID"]
-        auth_token = os.environ["TWILIO_AUTH_TOKEN"]
-    except KeyError:
-        logger.warning(
-            "Twilio credentials are not set. Fallback to a free STUN server from Google."  # noqa: E501
-        )
-        return [{"urls": ["stun:stun.l.google.com:19302"]}]
-
-    client = Client(account_sid, auth_token)
-
-    try:
-        token = client.tokens.create()
-    except TwilioRestException as e:
-        st.warning(
-            f"Error occurred while accessing Twilio API. Fallback to a free STUN server from Google. ({e})"  # noqa: E501
-        )
-        return [{"urls": ["stun:stun.l.google.com:19302"]}]
-
-    return token.ice_servers