diff --git a/README.md b/README.md
index 6bbb0e3..ddcb21b 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,19 @@ import cv2
import numpy as np
from gradio_webrtc import WebRTC
from pathlib import Path
+from twilio.rest import Client
+import os
+
+account_sid = os.environ.get("TWILIO_ACCOUNT_SID")
+auth_token = os.environ.get("TWILIO_AUTH_TOKEN")
+client = Client(account_sid, auth_token)
+
+token = client.tokens.create()
+
+rtc_configuration = {
+ "iceServers": token.ice_servers,
+ "iceTransportPolicy": "relay",
+}
CLASSES = [
"background",
@@ -113,7 +126,7 @@ with gr.Blocks(css=css) as demo:
""")
with gr.Column(elem_classes=["my-column"]):
with gr.Group(elem_classes=["my-group"]):
- image = WebRTC(label="Strean")
+ image = WebRTC(label="Strean", rtc_configuration=rtc_configuration)
conf_threshold = gr.Slider(
label="Confidence Threshold",
minimum=0.0,
@@ -426,16 +439,16 @@ int | None
-
streaming
+
rtc_configuration
```python
-bool
+dict[str, Any] | None
```
-
False
-
when used set as an output, takes video chunks yielded from the backend and combines them into one streaming video output. Each chunk should be a video file with a .ts extension using an h.264 encoding. Mp4 files are also accepted but they will be converted to h.264 encoding.
+
None
+
None
diff --git a/backend/gradio_webrtc/webrtc.py b/backend/gradio_webrtc/webrtc.py
index eb2c60b..25c2694 100644
--- a/backend/gradio_webrtc/webrtc.py
+++ b/backend/gradio_webrtc/webrtc.py
@@ -141,7 +141,7 @@ class WebRTC(Component):
show_download_button: bool | None = None,
min_length: int | None = None,
max_length: int | None = None,
- streaming: bool = False,
+ rtc_configuration: dict[str, Any] | None = None,
):
"""
Parameters:
@@ -185,7 +185,7 @@ class WebRTC(Component):
self.show_download_button = show_download_button
self.min_length = min_length
self.max_length = max_length
- self.streaming = streaming
+ self.rtc_configuration = rtc_configuration
self.event_handler: Callable | None = None
super().__init__(
label=label,
@@ -269,6 +269,7 @@ class WebRTC(Component):
print(pc.iceConnectionState)
if pc.iceConnectionState == "failed":
await pc.close()
+ self.connections.pop(body['webrtc_id'], None)
self.pcs.discard(pc)
@pc.on("connectionstatechange")
diff --git a/demo/app.py b/demo/app.py
index 5bef3fe..fadaf6c 100644
--- a/demo/app.py
+++ b/demo/app.py
@@ -3,6 +3,19 @@ import cv2
import numpy as np
from gradio_webrtc import WebRTC
from pathlib import Path
+from twilio.rest import Client
+import os
+
+account_sid = os.environ.get("TWILIO_ACCOUNT_SID")
+auth_token = os.environ.get("TWILIO_AUTH_TOKEN")
+client = Client(account_sid, auth_token)
+
+token = client.tokens.create()
+
+rtc_configuration = {
+ "iceServers": token.ice_servers,
+ "iceTransportPolicy": "relay",
+}
CLASSES = [
"background",
@@ -88,7 +101,7 @@ with gr.Blocks(css=css) as demo:
""")
with gr.Column(elem_classes=["my-column"]):
with gr.Group(elem_classes=["my-group"]):
- image = WebRTC(label="Strean")
+ image = WebRTC(label="Strean", rtc_configuration=rtc_configuration)
conf_threshold = gr.Slider(
label="Confidence Threshold",
minimum=0.0,
diff --git a/demo/requirements.txt b/demo/requirements.txt
index 2840c6b..1c604cb 100644
--- a/demo/requirements.txt
+++ b/demo/requirements.txt
@@ -1,3 +1,5 @@
safetensors==0.4.3
opencv-python
-https://gradio-builds.s3.amazonaws.com/5.0-dev/e85cc9248cc33e187528f24f3b4415ca7b9e7134/take2/gradio-5.0.0b1-py3-none-any.whl
\ No newline at end of file
+twilio
+https://huggingface.co/datasets/freddyaboulton/bucket/resolve/main/gradio-5.0.0b3-py3-none-any.whl
+https://huggingface.co/datasets/freddyaboulton/bucket/resolve/main/gradio_webrtc-0.0.1-py3-none-any.whl
\ No newline at end of file
diff --git a/demo/space.py b/demo/space.py
index e62edcf..293214c 100644
--- a/demo/space.py
+++ b/demo/space.py
@@ -3,7 +3,7 @@ import gradio as gr
from app import demo as app
import os
-_docs = {'WebRTC': {'description': 'Creates a video component that can be used to upload/record videos (as an input) or display videos (as an output).\nFor the video to be playable in the browser it must have a compatible container and codec combination. Allowed\ncombinations are .mp4 with h264 codec, .ogg with theora codec, and .webm with vp9 codec. If the component detects\nthat the output video would not be playable in the browser it will attempt to convert it to a playable mp4 video.\nIf the conversion fails, the original video is returned.\n', 'members': {'__init__': {'value': {'type': 'str\n | Path\n | tuple[str | Path, str | Path | None]\n | Callable\n | None', 'default': 'None', 'description': 'path or URL for the default value that WebRTC component is going to take. Can also be a tuple consisting of (video filepath, subtitle filepath). If a subtitle file is provided, it should be of type .srt or .vtt. Or can be callable, in which case the function will be called whenever the app loads to set the initial value of the component.'}, 'height': {'type': 'int | str | None', 'default': 'None', 'description': 'The height of the component, specified in pixels if a number is passed, or in CSS units if a string is passed. This has no effect on the preprocessed video file, but will affect the displayed video.'}, 'width': {'type': 'int | str | None', 'default': 'None', 'description': 'The width of the component, specified in pixels if a number is passed, or in CSS units if a string is passed. This has no effect on the preprocessed video file, but will affect the displayed video.'}, 'label': {'type': 'str | None', 'default': 'None', 'description': 'the label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.'}, 'every': {'type': 'Timer | float | None', 'default': 'None', 'description': 'continously calls `value` to recalculate it if `value` is a function (has no effect otherwise). Can provide a Timer whose tick resets `value`, or a float that provides the regular interval for the reset Timer.'}, 'inputs': {'type': 'Component | Sequence[Component] | set[Component] | None', 'default': 'None', 'description': 'components that are used as inputs to calculate `value` if `value` is a function (has no effect otherwise). `value` is recalculated any time the inputs change.'}, 'show_label': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will display label.'}, 'container': {'type': 'bool', 'default': 'True', 'description': 'if True, will place the component in a container - providing some extra padding around the border.'}, 'scale': {'type': 'int | None', 'default': 'None', 'description': 'relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.'}, 'min_width': {'type': 'int', 'default': '160', 'description': 'minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.'}, 'interactive': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will allow users to upload a video; if False, can only be used to display videos. If not provided, this is inferred based on whether the component is used as an input or output.'}, 'visible': {'type': 'bool', 'default': 'True', 'description': 'if False, component will be hidden.'}, 'elem_id': {'type': 'str | None', 'default': 'None', 'description': 'an optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'elem_classes': {'type': 'list[str] | str | None', 'default': 'None', 'description': 'an optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'render': {'type': 'bool', 'default': 'True', 'description': 'if False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.'}, 'key': {'type': 'int | str | None', 'default': 'None', 'description': 'if assigned, will be used to assume identity across a re-render. Components that have the same key across a re-render will have their value preserved.'}, 'mirror_webcam': {'type': 'bool', 'default': 'True', 'description': 'if True webcam will be mirrored. Default is True.'}, 'show_share_button': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.'}, 'show_download_button': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will show a download icon in the corner of the component that allows user to download the output. If False, icon does not appear. By default, it will be True for output components and False for input components.'}, 'min_length': {'type': 'int | None', 'default': 'None', 'description': 'the minimum length of video (in seconds) that the user can pass into the prediction function. If None, there is no minimum length.'}, 'max_length': {'type': 'int | None', 'default': 'None', 'description': 'the maximum length of video (in seconds) that the user can pass into the prediction function. If None, there is no maximum length.'}, 'streaming': {'type': 'bool', 'default': 'False', 'description': 'when used set as an output, takes video chunks yielded from the backend and combines them into one streaming video output. Each chunk should be a video file with a .ts extension using an h.264 encoding. Mp4 files are also accepted but they will be converted to h.264 encoding.'}}, 'postprocess': {'value': {'type': 'typing.Any', 'description': 'Expects a {str} or {pathlib.Path} filepath to a video which is displayed, or a {Tuple[str | pathlib.Path, str | pathlib.Path | None]} where the first element is a filepath to a video and the second element is an optional filepath to a subtitle file.'}}, 'preprocess': {'return': {'type': 'str', 'description': 'Passes the uploaded video as a `str` filepath or URL whose extension can be modified by `format`.'}, 'value': None}}, 'events': {'tick': {'type': None, 'default': None, 'description': ''}}}, '__meta__': {'additional_interfaces': {}, 'user_fn_refs': {'WebRTC': []}}}
+_docs = {'WebRTC': {'description': 'Creates a video component that can be used to upload/record videos (as an input) or display videos (as an output).\nFor the video to be playable in the browser it must have a compatible container and codec combination. Allowed\ncombinations are .mp4 with h264 codec, .ogg with theora codec, and .webm with vp9 codec. If the component detects\nthat the output video would not be playable in the browser it will attempt to convert it to a playable mp4 video.\nIf the conversion fails, the original video is returned.\n', 'members': {'__init__': {'value': {'type': 'str\n | Path\n | tuple[str | Path, str | Path | None]\n | Callable\n | None', 'default': 'None', 'description': 'path or URL for the default value that WebRTC component is going to take. Can also be a tuple consisting of (video filepath, subtitle filepath). If a subtitle file is provided, it should be of type .srt or .vtt. Or can be callable, in which case the function will be called whenever the app loads to set the initial value of the component.'}, 'height': {'type': 'int | str | None', 'default': 'None', 'description': 'The height of the component, specified in pixels if a number is passed, or in CSS units if a string is passed. This has no effect on the preprocessed video file, but will affect the displayed video.'}, 'width': {'type': 'int | str | None', 'default': 'None', 'description': 'The width of the component, specified in pixels if a number is passed, or in CSS units if a string is passed. This has no effect on the preprocessed video file, but will affect the displayed video.'}, 'label': {'type': 'str | None', 'default': 'None', 'description': 'the label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.'}, 'every': {'type': 'Timer | float | None', 'default': 'None', 'description': 'continously calls `value` to recalculate it if `value` is a function (has no effect otherwise). Can provide a Timer whose tick resets `value`, or a float that provides the regular interval for the reset Timer.'}, 'inputs': {'type': 'Component | Sequence[Component] | set[Component] | None', 'default': 'None', 'description': 'components that are used as inputs to calculate `value` if `value` is a function (has no effect otherwise). `value` is recalculated any time the inputs change.'}, 'show_label': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will display label.'}, 'container': {'type': 'bool', 'default': 'True', 'description': 'if True, will place the component in a container - providing some extra padding around the border.'}, 'scale': {'type': 'int | None', 'default': 'None', 'description': 'relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.'}, 'min_width': {'type': 'int', 'default': '160', 'description': 'minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.'}, 'interactive': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will allow users to upload a video; if False, can only be used to display videos. If not provided, this is inferred based on whether the component is used as an input or output.'}, 'visible': {'type': 'bool', 'default': 'True', 'description': 'if False, component will be hidden.'}, 'elem_id': {'type': 'str | None', 'default': 'None', 'description': 'an optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'elem_classes': {'type': 'list[str] | str | None', 'default': 'None', 'description': 'an optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'render': {'type': 'bool', 'default': 'True', 'description': 'if False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.'}, 'key': {'type': 'int | str | None', 'default': 'None', 'description': 'if assigned, will be used to assume identity across a re-render. Components that have the same key across a re-render will have their value preserved.'}, 'mirror_webcam': {'type': 'bool', 'default': 'True', 'description': 'if True webcam will be mirrored. Default is True.'}, 'show_share_button': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.'}, 'show_download_button': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will show a download icon in the corner of the component that allows user to download the output. If False, icon does not appear. By default, it will be True for output components and False for input components.'}, 'min_length': {'type': 'int | None', 'default': 'None', 'description': 'the minimum length of video (in seconds) that the user can pass into the prediction function. If None, there is no minimum length.'}, 'max_length': {'type': 'int | None', 'default': 'None', 'description': 'the maximum length of video (in seconds) that the user can pass into the prediction function. If None, there is no maximum length.'}, 'rtc_configuration': {'type': 'dict[str, Any] | None', 'default': 'None', 'description': None}}, 'postprocess': {'value': {'type': 'typing.Any', 'description': 'Expects a {str} or {pathlib.Path} filepath to a video which is displayed, or a {Tuple[str | pathlib.Path, str | pathlib.Path | None]} where the first element is a filepath to a video and the second element is an optional filepath to a subtitle file.'}}, 'preprocess': {'return': {'type': 'str', 'description': 'Passes the uploaded video as a `str` filepath or URL whose extension can be modified by `format`.'}, 'value': None}}, 'events': {'tick': {'type': None, 'default': None, 'description': ''}}}, '__meta__': {'additional_interfaces': {}, 'user_fn_refs': {'WebRTC': []}}}
abs_path = os.path.join(os.path.dirname(__file__), "css.css")
@@ -43,6 +43,19 @@ import cv2
import numpy as np
from gradio_webrtc import WebRTC
from pathlib import Path
+from twilio.rest import Client
+import os
+
+account_sid = os.environ.get("TWILIO_ACCOUNT_SID")
+auth_token = os.environ.get("TWILIO_AUTH_TOKEN")
+client = Client(account_sid, auth_token)
+
+token = client.tokens.create()
+
+rtc_configuration = {
+ "iceServers": token.ice_servers,
+ "iceTransportPolicy": "relay",
+}
CLASSES = [
"background",
@@ -128,7 +141,7 @@ with gr.Blocks(css=css) as demo:
\"\"\")
with gr.Column(elem_classes=["my-column"]):
with gr.Group(elem_classes=["my-group"]):
- image = WebRTC(label="Strean")
+ image = WebRTC(label="Strean", rtc_configuration=rtc_configuration)
conf_threshold = gr.Slider(
label="Confidence Threshold",
minimum=0.0,
diff --git a/frontend/Example.svelte b/frontend/Example.svelte
index 4d20b98..34bb6c9 100644
--- a/frontend/Example.svelte
+++ b/frontend/Example.svelte
@@ -1,5 +1,4 @@
-
gradio.dispatch("clear")}
on:play={() => gradio.dispatch("play")}
on:pause={() => gradio.dispatch("pause")}
diff --git a/frontend/index.ts b/frontend/index.ts
index fb16e85..9ab744b 100644
--- a/frontend/index.ts
+++ b/frontend/index.ts
@@ -1,6 +1,4 @@
export { default as BaseInteractiveVideo } from "./shared/InteractiveVideo.svelte";
-export { default as BaseStaticVideo } from "./shared/VideoPreview.svelte";
-export { default as BasePlayer } from "./shared/Player.svelte";
export { prettyBytes, playable, loaded } from "./shared/utils";
export { default as BaseExample } from "./Example.svelte";
import { default as Index } from "./Index.svelte";
diff --git a/frontend/package.json b/frontend/package.json
index c5846a0..ef2b5a0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -34,16 +34,6 @@
"gradio": "./Example.svelte",
"svelte": "./dist/Example.svelte",
"types": "./dist/Example.svelte.d.ts"
- },
- "./shared": {
- "gradio": "./shared/index.ts",
- "svelte": "./dist/shared/index.js",
- "types": "./dist/shared/index.d.ts"
- },
- "./base": {
- "gradio": "./shared/VideoPreview.svelte",
- "svelte": "./dist/shared/VideoPreview.svelte",
- "types": "./dist/shared/VideoPreview.svelte.d.ts"
}
},
"peerDependencies": {
diff --git a/frontend/shared/InteractiveVideo.svelte b/frontend/shared/InteractiveVideo.svelte
index 2edfc8b..4f60a40 100644
--- a/frontend/shared/InteractiveVideo.svelte
+++ b/frontend/shared/InteractiveVideo.svelte
@@ -19,8 +19,7 @@
export let server: {
offer: (body: any) => Promise;
};
-
- let has_change_history = false;
+ export let rtc_configuration: Object;
const dispatch = createEventDispatcher<{
change: FileData | null;
@@ -46,6 +45,7 @@
- import { createEventDispatcher } from "svelte";
- import { Play, Pause, Maximise, Undo } from "@gradio/icons";
- import Video from "./Video.svelte";
- import VideoControls from "./VideoControls.svelte";
- import type { FileData, Client } from "@gradio/client";
- import { prepare_files } from "@gradio/client";
- import { format_time } from "@gradio/utils";
- import type { I18nFormatter } from "@gradio/utils";
-
- export let root = "";
- export let src: string;
- export let subtitle: string | null = null;
- export let mirror: boolean;
- export let autoplay: boolean;
- export let loop: boolean;
- export let label = "test";
- export let interactive = false;
- export let handle_change: (video: FileData) => void = () => {};
- export let handle_reset_value: () => void = () => {};
- export let upload: Client["upload"];
- export let is_stream: boolean | undefined;
- export let i18n: I18nFormatter;
- export let show_download_button = false;
- export let value: FileData | null = null;
- export let handle_clear: () => void = () => {};
- export let has_change_history = false;
-
- const dispatch = createEventDispatcher<{
- play: undefined;
- pause: undefined;
- stop: undefined;
- end: undefined;
- clear: undefined;
- }>();
-
- let time = 0;
- let duration: number;
- let paused = true;
- let video: HTMLVideoElement;
- let processingVideo = false;
-
- function handleMove(e: TouchEvent | MouseEvent): void {
- if (!duration) return;
-
- if (e.type === "click") {
- handle_click(e as MouseEvent);
- return;
- }
-
- if (e.type !== "touchmove" && !((e as MouseEvent).buttons & 1)) return;
-
- const clientX =
- e.type === "touchmove"
- ? (e as TouchEvent).touches[0].clientX
- : (e as MouseEvent).clientX;
- const { left, right } = (
- e.currentTarget as HTMLProgressElement
- ).getBoundingClientRect();
- time = (duration * (clientX - left)) / (right - left);
- }
-
- async function play_pause(): Promise {
- if (document.fullscreenElement != video) {
- const isPlaying =
- video.currentTime > 0 &&
- !video.paused &&
- !video.ended &&
- video.readyState > video.HAVE_CURRENT_DATA;
-
- if (!isPlaying) {
- await video.play();
- } else video.pause();
- }
- }
-
- function handle_click(e: MouseEvent): void {
- const { left, right } = (
- e.currentTarget as HTMLProgressElement
- ).getBoundingClientRect();
- time = (duration * (e.clientX - left)) / (right - left);
- }
-
- function handle_end(): void {
- dispatch("stop");
- dispatch("end");
- }
-
- const handle_trim_video = async (videoBlob: Blob): Promise => {
- let _video_blob = new File([videoBlob], "video.mp4");
- const val = await prepare_files([_video_blob]);
- let value = ((await upload(val, root))?.filter(Boolean) as FileData[])[0];
-
- handle_change(value);
- };
-
- function open_full_screen(): void {
- video.requestFullscreen();
- }
-
-
-