Merge pull request #982 from twmsh/master

update bytes(protobuf types) mapping, from Vec<u8> to bytes:Byte

libs/hbb_common/Cargo.toml

@@ -11,7 +11,7 @@ protobuf = { version = "3.1", features = ["with-bytes"] }
 tokio = { version = "1.20", features = ["full"] }
 tokio-util = { version = "0.7", features = ["full"] }
 futures = "0.3"
-bytes = "1.1"
+bytes = { version = "1.2", features = ["serde"] }
 log = "0.4"
 env_logger = "0.9"
 socket2 = { version = "0.3", features = ["reuseport"] }

libs/hbb_common/build.rs

@@ -5,6 +5,10 @@ fn main() {
         .out_dir("src/protos")
         .inputs(&["protos/rendezvous.proto", "protos/message.proto"])
         .include("protos")
+        .customize(
+            protobuf_codegen::Customize::default()
+            .tokio_bytes(true)
+        )
         .run()
         .expect("Codegen failed.");
 }

libs/scrap/src/common/vpxcodec.rs

@@ -12,6 +12,7 @@ use crate::STRIDE_ALIGN;
 use super::vpx::{vp8e_enc_control_id::*, vpx_codec_err_t::*, *};
 use std::os::raw::{c_int, c_uint};
 use std::{ptr, slice};
+use hbb_common::bytes::Bytes;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum VpxVideoCodecId {
@@ -291,7 +292,7 @@ impl VpxEncoder {
     #[inline]
     fn create_frame(frame: &EncodeFrame) -> EncodedVideoFrame {
         EncodedVideoFrame {
-            data: frame.data.to_vec(),
+            data: Bytes::from(frame.data.to_vec()),
             key: frame.key,
             pts: frame.pts,
             ..Default::default()