Skip to content
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.

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

bump FFI to 0.12.4 #333

Merged
merged 11 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions .github/workflows/build-rtc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
- uses: actions/setup-python@v4

- name: Install Protoc
uses: arduino/setup-protoc@v2
uses: arduino/setup-protoc@v3
with:
version: "25.1"
version: "26.x"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install deps
Expand All @@ -55,7 +55,6 @@ jobs:
default_author: github_actions
message: generated protobuf


build_wheels:
name: Build RTC wheels (${{ matrix.archs }})
runs-on: ${{ matrix.os }}
Expand Down
3 changes: 2 additions & 1 deletion livekit-rtc/generate_proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ protoc \
$FFI_PROTOCOL/video_frame.proto \
$FFI_PROTOCOL/e2ee.proto \
$FFI_PROTOCOL/stats.proto \
$FFI_PROTOCOL/track_publication.proto \
$FFI_PROTOCOL/rpc.proto

touch -a "$FFI_OUT_PYTHON/__init__.py"

for f in "$FFI_OUT_PYTHON"/*.py "$FFI_OUT_PYTHON"/*.pyi; do
perl -i -pe 's|^(import (audio_frame_pb2\|ffi_pb2\|handle_pb2\|participant_pb2\|room_pb2\|track_pb2\|video_frame_pb2\|e2ee_pb2\|stats_pb2\|rpc_pb2))|from . $1|g' "$f"
perl -i -pe 's|^(import (audio_frame_pb2\|ffi_pb2\|handle_pb2\|participant_pb2\|room_pb2\|track_pb2\|video_frame_pb2\|e2ee_pb2\|stats_pb2\|rpc_pb2\|track_publication_pb2))|from . $1|g' "$f"
done
3 changes: 2 additions & 1 deletion livekit-rtc/livekit/rtc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from ._proto import stats_pb2 as stats
from ._proto.e2ee_pb2 import EncryptionState, EncryptionType
from ._proto.participant_pb2 import ParticipantKind
from ._proto.participant_pb2 import ParticipantKind, DisconnectReason
from ._proto.room_pb2 import (
ConnectionQuality,
ConnectionState,
Expand Down Expand Up @@ -98,6 +98,7 @@
"LocalParticipant",
"Participant",
"ParticipantKind",
"DisconnectReason",
"RemoteParticipant",
"ConnectError",
"Room",
Expand Down
6 changes: 3 additions & 3 deletions livekit-rtc/livekit/rtc/_proto/audio_frame_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions livekit-rtc/livekit/rtc/_proto/e2ee_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 25 additions & 24 deletions livekit-rtc/livekit/rtc/_proto/ffi_pb2.py

Large diffs are not rendered by default.

33 changes: 27 additions & 6 deletions livekit-rtc/livekit/rtc/_proto/ffi_pb2.pyi

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions livekit-rtc/livekit/rtc/_proto/handle_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions livekit-rtc/livekit/rtc/_proto/participant_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 70 additions & 2 deletions livekit-rtc/livekit/rtc/_proto/participant_pb2.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

186 changes: 100 additions & 86 deletions livekit-rtc/livekit/rtc/_proto/room_pb2.py

Large diffs are not rendered by default.

Loading
Loading