feat: add QOIZ image codec

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Author: elmarco

Cargo.lock

@@ -28,6 +28,7 @@ default = ["rustls"]
 rustls = ["ironrdp-tls/rustls"]
 native-tls = ["ironrdp-tls/native-tls"]
 qoi = ["ironrdp/qoi"]
+qoiz = ["ironrdp/qoiz"]
 
 [dependencies]
 # Protocols

crates/ironrdp-client/Cargo.toml

@@ -19,6 +19,7 @@ test = false
 default = []
 arbitrary = ["dep:arbitrary"]
 qoi = ["ironrdp-pdu/qoi"]
+qoiz = ["ironrdp-pdu/qoiz"]
 
 [dependencies]
 ironrdp-svc = { path = "../ironrdp-svc", version = "0.3" } # public

crates/ironrdp-connector/Cargo.toml

@@ -20,6 +20,7 @@ default = []
 std = ["alloc", "ironrdp-error/std", "ironrdp-core/std"]
 alloc = ["ironrdp-core/alloc", "ironrdp-error/alloc"]
 qoi = []
+qoiz = ["qoi"]
 
 [dependencies]
 bitflags = "2.4"

crates/ironrdp-pdu/Cargo.toml

@@ -42,6 +42,9 @@ const GUID_IGNORE: Guid = Guid(0x9c43_51a6, 0x3535, 0x42ae, 0x91, 0x0c, 0xcd, 0x
 #[rustfmt::skip]
 #[cfg(feature="qoi")]
 const GUID_QOI: Guid = Guid(0x4dae_9af8, 0xb399, 0x4df6, 0xb4, 0x3a, 0x66, 0x2f, 0xd9, 0xc0, 0xf5, 0xd6);
+#[rustfmt::skip]
+#[cfg(feature="qoiz")]
+const GUID_QOIZ: Guid = Guid(0x229c_c6dc, 0xa860, 0x4b52, 0xb4, 0xd8, 0x05, 0x3a, 0x22, 0xb3, 0x89, 0x2b);
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct Guid(u32, u16, u16, u8, u8, u8, u8, u8, u8, u8, u8);
@@ -171,6 +174,8 @@ impl Encode for Codec {
             CodecProperty::Ignore => GUID_IGNORE,
             #[cfg(feature = "qoi")]
             CodecProperty::Qoi => GUID_QOI,
+            #[cfg(feature = "qoiz")]
+            CodecProperty::QoiZ => GUID_QOIZ,
             _ => return Err(other_err!("invalid codec")),
         };
         guid.encode(dst)?;
@@ -210,6 +215,8 @@ impl Encode for Codec {
             }
             #[cfg(feature = "qoi")]
             CodecProperty::Qoi => dst.write_u16(0),
+            #[cfg(feature = "qoiz")]
+            CodecProperty::QoiZ => dst.write_u16(0),
             CodecProperty::Ignore => dst.write_u16(0),
             CodecProperty::None => dst.write_u16(0),
         };
@@ -235,6 +242,8 @@ impl Encode for Codec {
                 },
                 #[cfg(feature = "qoi")]
                 CodecProperty::Qoi => 0,
+                #[cfg(feature = "qoiz")]
+                CodecProperty::QoiZ => 0,
                 CodecProperty::Ignore => 0,
                 CodecProperty::None => 0,
             }
@@ -271,6 +280,8 @@ impl<'de> Decode<'de> for Codec {
                 }
                 #[cfg(feature = "qoi")]
                 GUID_QOI => CodecProperty::Qoi,
+                #[cfg(feature = "qoiz")]
+                GUID_QOIZ => CodecProperty::QoiZ,
                 GUID_IGNORE => CodecProperty::Ignore,
                 _ => CodecProperty::None,
             }
@@ -284,6 +295,8 @@ impl<'de> Decode<'de> for Codec {
                 }
                 #[cfg(feature = "qoi")]
                 GUID_QOI => CodecProperty::Qoi,
+                #[cfg(feature = "qoiz")]
+                GUID_QOIZ => CodecProperty::QoiZ,
                 GUID_IGNORE => CodecProperty::Ignore,
                 _ => CodecProperty::None,
             }
@@ -307,6 +320,8 @@ pub enum CodecProperty {
     Ignore,
     #[cfg(feature = "qoi")]
     Qoi,
+    #[cfg(feature = "qoiz")]
+    QoiZ,
     None,
 }
 
@@ -644,6 +659,8 @@ pub enum CodecId {
     RemoteFx = 0x03,
     #[cfg(feature = "qoi")]
     Qoi = 0x0A,
+    #[cfg(feature = "qoiz")]
+    QoiZ = 0x0B,
 }
 
 impl CodecId {
@@ -653,6 +670,8 @@ impl CodecId {
             0x03 => Some(Self::RemoteFx),
             #[cfg(feature = "qoi")]
             0x0A => Some(Self::Qoi),
+            #[cfg(feature = "qoiz")]
+            0x0B => Some(Self::QoiZ),
             _ => None,
         }
     }
@@ -723,6 +742,14 @@ pub fn client_codecs_capabilities(config: &[&str]) -> Result<BitmapCodecs, Strin
         });
     }
 
+    #[cfg(feature = "qoiz")]
+    if config.remove("qoiz").unwrap_or(true) {
+        codecs.push(Codec {
+            id: CodecId::QoiZ as u8,
+            property: CodecProperty::QoiZ,
+        });
+    }
+
     let codec_names = config.keys().copied().collect::<Vec<_>>().join(", ");
     if !codec_names.is_empty() {
         return Err(format!("Unknown codecs: {}", codec_names));
@@ -772,6 +799,14 @@ pub fn server_codecs_capabilities(config: &[&str]) -> Result<BitmapCodecs, Strin
         });
     }
 
+    #[cfg(feature = "qoiz")]
+    if config.remove("qoiz").unwrap_or(true) {
+        codecs.push(Codec {
+            id: 0,
+            property: CodecProperty::QoiZ,
+        });
+    }
+
     let codec_names = config.keys().copied().collect::<Vec<_>>().join(", ");
     if !codec_names.is_empty() {
         return Err(format!("Unknown codecs: {}", codec_names));

crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs.rs

@@ -19,10 +19,11 @@ name = "perfenc"
 required-features = ["__bench"]
 
 [features]
-default = ["rayon", "qoi"]
+default = ["rayon", "qoi", "qoiz"]
 helper = ["dep:x509-cert", "dep:rustls-pemfile"]
 rayon = ["dep:rayon"]
 qoi = ["dep:qoi", "ironrdp-pdu/qoi"]
+qoiz = ["dep:zstd-safe", "qoi", "ironrdp-pdu/qoiz"]
 
 # Internal (PRIVATE!) features used to aid testing.
 # Don't rely on these whatsoever. They may disappear at any time.
@@ -52,6 +53,7 @@ rayon = { version = "1.10.0", optional = true }
 bytes = "1"
 visibility = { version = "0.1", optional = true }
 qoi = { version = "0.4", optional = true }
+zstd-safe = { version = "7.2", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1", features = ["sync", "fs"] }

crates/ironrdp-server/Cargo.toml

@@ -11,6 +11,7 @@ use ironrdp_server::{
 };
 use tokio::{fs::File, io::AsyncReadExt};
 
+#[allow(clippy::similar_names)]
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), anyhow::Error> {
     setup_logging()?;
@@ -41,22 +42,26 @@ async fn main() -> Result<(), anyhow::Error> {
     let mut flags = CmdFlags::all();
 
     #[allow(unused)]
-    let (remotefx, qoicodec) = match codec {
-        OptCodec::RemoteFX => (Some((EntropyBits::Rlgr3, 0)), None::<u8>),
+    let (remotefx, qoicodec, qoizcodec) = match codec {
+        OptCodec::RemoteFX => (Some((EntropyBits::Rlgr3, 0)), None, None),
         OptCodec::Bitmap => {
             flags -= CmdFlags::SET_SURFACE_BITS;
-            (None, None)
+            (None, None, None)
         }
-        OptCodec::None => (None, None),
+        OptCodec::None => (None, None, None),
         #[cfg(feature = "qoi")]
-        OptCodec::Qoi => (None, Some(0)),
+        OptCodec::Qoi => (None, Some(0), None),
+        #[cfg(feature = "qoiz")]
+        OptCodec::QoiZ => (None, None, Some(0)),
     };
     let mut encoder = UpdateEncoder::new(
         DesktopSize { width, height },
         flags,
         remotefx,
         #[cfg(feature = "qoi")]
         qoicodec,
+        #[cfg(feature = "qoiz")]
+        qoizcodec,
     );
 
     let mut total_raw = 0u64;
@@ -158,6 +163,8 @@ enum OptCodec {
     None,
     #[cfg(feature = "qoi")]
     Qoi,
+    #[cfg(feature = "qoiz")]
+    QoiZ,
 }
 
 impl Default for OptCodec {
@@ -176,6 +183,8 @@ impl core::str::FromStr for OptCodec {
             "none" => Ok(Self::None),
             #[cfg(feature = "qoi")]
             "qoi" => Ok(Self::Qoi),
+            #[cfg(feature = "qoiz")]
+            "qoiz" => Ok(Self::QoiZ),
             _ => Err(anyhow::anyhow!("unknown codec: {}", s)),
         }
     }