Skip to content

fix: add resolution arguments to VideoSource #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2023
Merged

fix: add resolution arguments to VideoSource #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027339c
add resolution arguments to VideoSource
theomonnom Nov 5, 2023
125622e
update example
theomonnom Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions examples/e2ee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
# ("livekitrocks") this is our shared key, it must match the one used by your clients
SHARED_KEY = b"livekitrocks"

WIDTH, HEIGHT = 1280, 720

async def draw_cube(source: rtc.VideoSource):
W, H, MID_W, MID_H = 1280, 720, 640, 360
MID_W, MID_H = 640, 360
cube_size = 60
vertices = (
np.array(
Expand Down Expand Up @@ -45,7 +46,7 @@ async def draw_cube(source: rtc.VideoSource):
[3, 7],
]

frame = rtc.ArgbFrame.create(rtc.VideoFormatType.FORMAT_ARGB, W, H)
frame = rtc.ArgbFrame.create(rtc.VideoFormatType.FORMAT_ARGB, WIDTH, HEIGHT)
arr = np.frombuffer(frame.data, dtype=np.uint8)
angle = 0

Expand Down Expand Up @@ -82,8 +83,8 @@ async def draw_cube(source: rtc.VideoSource):
)
for dx in [-1, 0, 1]:
for dy in [-1, 0, 1]:
if 0 <= x + dx < W and 0 <= y + dy < H:
idx = (y + dy) * W * 4 + (x + dx) * 4
if 0 <= x + dx < WIDTH and 0 <= y + dy < HEIGHT:
idx = (y + dy) * WIDTH * 4 + (x + dx) * 4
arr[idx : idx + 4] = [255, 255, 255, 255]

f = rtc.VideoFrame(0, rtc.VideoRotation.VIDEO_ROTATION_0, frame.to_i420())
Expand Down Expand Up @@ -116,7 +117,7 @@ def on_e2ee_state_changed(
return False

# publish a track
source = rtc.VideoSource()
source = rtc.VideoSource(WIDTH, HEIGHT)
track = rtc.LocalVideoTrack.create_video_track("cube", source)
options = rtc.TrackPublishOptions()
options.source = rtc.TrackSource.SOURCE_CAMERA
Expand Down
5 changes: 3 additions & 2 deletions examples/publish_hue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
URL = "ws://localhost:7880"
TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE5MDY2MTMyODgsImlzcyI6IkFQSVRzRWZpZFpqclFvWSIsIm5hbWUiOiJuYXRpdmUiLCJuYmYiOjE2NzI2MTMyODgsInN1YiI6Im5hdGl2ZSIsInZpZGVvIjp7InJvb20iOiJ0ZXN0Iiwicm9vbUFkbWluIjp0cnVlLCJyb29tQ3JlYXRlIjp0cnVlLCJyb29tSm9pbiI6dHJ1ZSwicm9vbUxpc3QiOnRydWV9fQ.uSNIangMRu8jZD5mnRYoCHjcsQWCrJXgHCs0aNIgBFY" # noqa

WIDTH, HEIGHT = 1280, 720

async def draw_color_cycle(source: rtc.VideoSource):
argb_frame = rtc.ArgbFrame.create(rtc.VideoFormatType.FORMAT_ARGB, 1280, 720)
argb_frame = rtc.ArgbFrame.create(rtc.VideoFormatType.FORMAT_ARGB, WIDTH, HEIGHT)
arr = np.frombuffer(argb_frame.data, dtype=np.uint8)

framerate = 1 / 30
Expand Down Expand Up @@ -50,7 +51,7 @@ async def main(room: rtc.Room):
return

# publish a track
source = rtc.VideoSource()
source = rtc.VideoSource(WIDTH, HEIGHT)
track = rtc.LocalVideoTrack.create_video_track("hue", source)
options = rtc.TrackPublishOptions()
options.source = rtc.TrackSource.SOURCE_CAMERA
Expand Down
4 changes: 3 additions & 1 deletion livekit-rtc/livekit/rtc/video_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@


class VideoSource:
def __init__(self) -> None:
def __init__(self, width: int, height: int) -> None:
Copy link
Member

@davidzhao davidzhao Nov 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we have a default value to avoid breaking the interface?

req = proto_ffi.FfiRequest()
req.new_video_source.type = (
proto_video_frame.VideoSourceType.VIDEO_SOURCE_NATIVE
)
req.new_video_source.resolution.width = width
req.new_video_source.resolution.height = height

resp = ffi_client.request(req)
self._info = resp.new_video_source.source
Expand Down