Skip to content

Commit 0e93d36

Browse files
committed
pr comments
1 parent 070769b commit 0e93d36

File tree

14 files changed

+83
-531
lines changed

14 files changed

+83
-531
lines changed

Cargo.lock

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

livekit-ffi/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ futures-util = { version = "0.3", default-features = false, features = ["sink"]
2727
parking_lot = { version = "0.12", features = ["deadlock_detection"] }
2828
prost = "0.12"
2929
prost-types = "0.12"
30-
pbjson = "0.6"
31-
pbjson-types = "0.6"
3230
lazy_static = "1.4"
3331
thiserror = "1.0"
3432
log = "0.4"

livekit-ffi/generate_proto.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ OUT_RUST=src
2020
protoc \
2121
-I=$PROTOCOL \
2222
--prost_out=$OUT_RUST \
23-
--prost_opt=compile_well_known_types \
24-
--prost_opt=extern_path=.google.protobuf=::pbjson_types \
2523
$PROTOCOL/ffi.proto \
2624
$PROTOCOL/handle.proto \
2725
$PROTOCOL/room.proto \
@@ -33,5 +31,4 @@ protoc \
3331
$PROTOCOL/e2ee.proto \
3432
$PROTOCOL/stats.proto \
3533
$PROTOCOL/rpc.proto \
36-
$PROTOCOL/data_stream.proto \
37-
$PROTOCOL/metrics.proto
34+
$PROTOCOL/data_stream.proto

livekit-ffi/generate_proto_win.bat

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ set OUT_RUST=src
2020
protoc.exe ^
2121
-I=%PROTOCOL% ^
2222
--prost_out=%OUT_RUST% ^
23-
--prost_opt=compile_well_known_types ^
24-
--prost_opt=extern_path=.google.protobuf=::pbjson_types ^
2523
%PROTOCOL%/ffi.proto ^
2624
%PROTOCOL%/handle.proto ^
2725
%PROTOCOL%/room.proto ^
@@ -33,5 +31,4 @@ protoc.exe ^
3331
%PROTOCOL%/e2ee.proto ^
3432
%PROTOCOL%/stats.proto ^
3533
%PROTOCOL%/rpc.proto ^
36-
%PROTOCOL%/data_stream.proto ^
37-
%PROTOCOL%/metrics.proto
34+
%PROTOCOL%/data_stream.proto

livekit-ffi/protocol/ffi.proto

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import "video_frame.proto";
2626
import "audio_frame.proto";
2727
import "rpc.proto";
2828
import "data_stream.proto";
29-
import "metrics.proto";
3029

3130
// **How is the livekit-ffi working:
3231
// We refer as the ffi server the Rust server that is running the LiveKit client implementation, and we
@@ -308,10 +307,9 @@ message FfiEvent {
308307

309308
message PublishMetricsRequest {
310309
required uint64 local_participant_handle = 1;
311-
repeated string str_data = 2;
312-
repeated TimeSeriesMetric time_series = 3;
313-
repeated EventMetric events = 4;
314-
optional uint64 async_id = 5;
310+
required uint64 data_ptr = 2;
311+
required uint64 data_len = 3;
312+
optional uint64 async_id = 4;
315313
}
316314

317315
message PublishMetricsResponse {

livekit-ffi/protocol/metrics.proto

Lines changed: 0 additions & 89 deletions
This file was deleted.

livekit-ffi/src/conversion/metrics.rs

Lines changed: 0 additions & 145 deletions
This file was deleted.

livekit-ffi/src/conversion/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ pub mod room;
2020
pub mod stats;
2121
pub mod track;
2222
pub mod video_frame;
23-
pub mod metrics;

0 commit comments

Comments
 (0)