Merge branch 'abr' into hwcodec

libs/hbb_common/protos/message.proto

@@ -447,9 +447,9 @@ message PermissionInfo {
 
 enum ImageQuality {
   NotSet = 0;
-  Low = 2;
-  Balanced = 3;
-  Best = 4;
+  Low = 50;
+  Balanced = 66;
+  Best = 100;
 }
 
 message VideoCodecState {
@@ -471,7 +471,7 @@ message OptionMessage {
   BoolOption show_remote_cursor = 3;
   BoolOption privacy_mode = 4;
   BoolOption block_input = 5;
-  int32 custom_image_quality = 6;
+  uint32 custom_image_quality = 6;
   BoolOption disable_audio = 7;
   BoolOption disable_clipboard = 8;
   BoolOption enable_file_transfer = 9;
@@ -481,6 +481,8 @@ message OptionMessage {
 message TestDelay {
   int64 time = 1;
   bool from_client = 2;
+  uint32 last_delay = 3;
+  uint32 target_bitrate = 4;
 }
 
 message PublicKey {

libs/hbb_common/src/config.rs

@@ -140,6 +140,8 @@ pub struct PeerConfig {
     pub disable_clipboard: bool,
     #[serde(default)]
     pub enable_file_transfer: bool,
+    #[serde(default)]
+    pub show_quality_monitor: bool,
 
     // the other scalar value must before this
     #[serde(default)]

libs/scrap/src/common/android.rs

@@ -3,8 +3,8 @@ use crate::rgba_to_i420;
 use lazy_static::lazy_static;
 use serde_json::Value;
 use std::collections::HashMap;
-use std::io;
 use std::sync::Mutex;
+use std::{io, time::Duration};
 
 lazy_static! {
     static ref SCREEN_SIZE: Mutex<(u16, u16, u16)> = Mutex::new((0, 0, 0)); // (width, height, scale)
@@ -33,7 +33,7 @@ impl Capturer {
         self.display.height() as usize
     }
 
-    pub fn frame<'a>(&'a mut self, _timeout_ms: u32) -> io::Result<Frame<'a>> {
+    pub fn frame<'a>(&'a mut self, _timeout: Duration) -> io::Result<Frame<'a>> {
         if let Some(buf) = get_video_raw() {
             crate::would_block_if_equal(&mut self.saved_raw_data, buf)?;
             rgba_to_i420(self.width(), self.height(), buf, &mut self.bgra);

libs/scrap/src/common/codec.rs

@@ -50,6 +50,8 @@ pub trait EncoderApi {
     fn encode_to_message(&mut self, frame: &[u8], ms: i64) -> ResultType<Message>;
 
     fn use_yuv(&self) -> bool;
+
+    fn set_bitrate(&mut self, bitrate: u32) -> ResultType<()>;
 }
 
 pub struct DecoderCfg {

libs/scrap/src/common/vpxcodec.rs

@@ -119,17 +119,6 @@ impl EncoderApi for VpxEncoder {
                 c.rc_target_bitrate = config.bitrate;
                 c.rc_undershoot_pct = 95;
                 c.rc_dropframe_thresh = 25;
-                if config.rc_min_quantizer > 0 {
-                    c.rc_min_quantizer = config.rc_min_quantizer;
-                }
-                if config.rc_max_quantizer > 0 {
-                    c.rc_max_quantizer = config.rc_max_quantizer;
-                }
-                let mut speed = config.speed;
-                if speed <= 0 {
-                    speed = 6;
-                }
-
                 c.g_threads = if config.num_threads == 0 {
                     num_cpus::get() as _
                 } else {
@@ -174,7 +163,7 @@ impl EncoderApi for VpxEncoder {
                     Higher numbers (7 or 8) will be lower quality but more manageable for lower latency
                     use cases and also for lower CPU power devices such as mobile.
                     */
-                    call_vpx!(vpx_codec_control_(&mut ctx, VP8E_SET_CPUUSED as _, speed,));
+                    call_vpx!(vpx_codec_control_(&mut ctx, VP8E_SET_CPUUSED as _, 7,));
                     // set row level multi-threading
                     /*
                     as some people in comments and below have already commented,
@@ -232,6 +221,13 @@ impl EncoderApi for VpxEncoder {
     fn use_yuv(&self) -> bool {
         true
     }
+
+    fn set_bitrate(&mut self, bitrate: u32) -> ResultType<()> {
+        let mut new_enc_cfg = unsafe { *self.ctx.config.enc.to_owned() };
+        new_enc_cfg.rc_target_bitrate = bitrate;
+        call_vpx!(vpx_codec_enc_config_set(&mut self.ctx, &new_enc_cfg));
+        return Ok(());
+    }
 }
 
 impl VpxEncoder {
@@ -336,9 +332,6 @@ pub struct VpxEncoderConfig {
     pub bitrate: c_uint,
     /// The codec
     pub codec: VpxVideoCodecId,
-    pub rc_min_quantizer: u32,
-    pub rc_max_quantizer: u32,
-    pub speed: i32,
     pub num_threads: u32,
 }
 

libs/scrap/src/common/x11.rs

@@ -1,5 +1,5 @@
 use crate::x11;
-use std::{io, ops};
+use std::{io, ops, time::Duration};
 
 pub struct Capturer(x11::Capturer);
 
@@ -16,7 +16,7 @@ impl Capturer {
         self.0.display().rect().h as usize
     }
 
-    pub fn frame<'a>(&'a mut self, _timeout_ms: u32) -> io::Result<Frame<'a>> {
+    pub fn frame<'a>(&'a mut self, _timeout: Duration) -> io::Result<Frame<'a>> {
         Ok(Frame(self.0.frame()?))
     }
 }