fix ptr align (#302)

livekit · Feb 6, 2024 · 32035af · 32035af
1 parent 4ca4129
commit 32035af
Show file tree

Hide file tree

Showing 4 changed files with 539 additions and 366 deletions.
diff --git a/livekit-ffi/protocol/video_frame.proto b/livekit-ffi/protocol/video_frame.proto
@@ -100,16 +100,15 @@ enum VideoBufferType {
 
 message VideoBufferInfo {
   message ComponentInfo {
-    uint32 offset = 1;
+    uint64 data_ptr = 1;
     uint32 stride = 2;
     uint32 size = 3;
   }
   VideoBufferType type = 1;
   uint32 width = 2;
   uint32 height = 3;
   uint64 data_ptr = 4;
-  uint32 data_len = 5;
-  uint32 stride = 6; // for packed formats
+  uint32 stride = 6; // only for packed formats
   repeated ComponentInfo components = 7;
 }
 

diff --git a/livekit-ffi/src/livekit.proto.rs b/livekit-ffi/src/livekit.proto.rs
@@ -1619,9 +1619,7 @@ pub struct VideoBufferInfo {
     pub height: u32,
     #[prost(uint64, tag="4")]
     pub data_ptr: u64,
-    #[prost(uint32, tag="5")]
-    pub data_len: u32,
-    /// for packed formats
+    /// only for packed formats
     #[prost(uint32, tag="6")]
     pub stride: u32,
     #[prost(message, repeated, tag="7")]
@@ -1632,8 +1630,8 @@ pub mod video_buffer_info {
     #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ComponentInfo {
-        #[prost(uint32, tag="1")]
-        pub offset: u32,
+        #[prost(uint64, tag="1")]
+        pub data_ptr: u64,
         #[prost(uint32, tag="2")]
         pub stride: u32,
         #[prost(uint32, tag="3")]