Merge branch 'master' into dependabot/cargo/libgit2-sys-0.16.21.7.2

Author: kodawah

.github/workflows/deploy.yml

@@ -472,7 +472,7 @@ jobs:
 
     - name: Create a scheduled pre-release
       if: github.event_name == 'schedule'
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         name: Weekly pre-release
         prerelease: true
@@ -506,7 +506,7 @@ jobs:
 
     - name: Create a pre-release
       if: startsWith(github.ref, 'refs/tags/p')
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         name: Weekly pre-release
         prerelease: true
@@ -539,7 +539,7 @@ jobs:
 
     - name: Create a release
       if: startsWith(github.ref, 'refs/tags/v')
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         name: v${{ steps.tagName.outputs.version }}
         files: |

.github/workflows/rav1e.yml

@@ -25,11 +25,79 @@ jobs:
         run: |
           cargo fmt -- --check --verbose
       - name: Run clippy
-        uses: actions-rs/clippy-check@v1
+        uses: clechasseur/rs-clippy-check@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
           args: -- -D warnings --verbose -A clippy::wrong-self-convention -A clippy::many_single_char_names -A clippy::upper-case-acronyms
 
+  msrv:
+    runs-on: ubuntu-22.04
+
+    env:
+      CARGO_INCREMENTAL: 0
+      RUSTFLAGS: '-Dwarnings'
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Minimum version in build.rs
+      - name: Install NASM 2.15
+        uses: ilammy/setup-nasm@v1
+        with:
+          version: 2.15
+
+      # Minimum version in Cargo.toml
+      - name: Install Rust 1.70.0
+        uses: dtolnay/[email protected]
+        with:
+          targets: wasm32-unknown-unknown, wasm32-wasi
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: v1-rust
+
+      - name: Run cargo check
+        run: cargo check
+
+      - name: Run cargo check (wasm32)
+        run: >
+          cargo check
+          --target wasm32-unknown-unknown
+          --no-default-features
+          -F wasm
+
+      - name: Run cargo check (wasi)
+        run: >
+          cargo check
+          --target wasm32-wasi
+          --no-default-features
+
+  wasi:
+    runs-on: ubuntu-22.04
+    needs: [rustfmt-clippy, msrv]
+
+    env:
+      CARGO_INCREMENTAL: 0
+      RUSTFLAGS: '-Dwarnings'
+      CARGO_TARGET_WASM32_WASI_RUNNER: wasmtime
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install wasmtime
+        uses: taiki-e/install-action@wasmtime
+
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-wasi
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run tests
+        run: >
+          cargo test
+          --target wasm32-wasi
+          --no-default-features
+
   build-unix:
     strategy:
       matrix:
@@ -85,6 +153,7 @@ jobs:
       SCCACHE_IDLE_TIMEOUT: 0
 
     runs-on: ubuntu-22.04
+    needs: [rustfmt-clippy, msrv]
 
     steps:
       - uses: actions/checkout@v4
@@ -277,7 +346,7 @@ jobs:
           sccache --stop-server
       - name: Codecov upload
         if: matrix.conf == 'grcov-codecov'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: lcov.info
 
@@ -308,6 +377,8 @@ jobs:
       SCCACHE_DIR: /Users/runner/Library/Caches/Mozilla.sccache
 
     runs-on: macos-latest
+    needs: [rustfmt-clippy, msrv]
+
     steps:
       - uses: actions/checkout@v4
       - name: Install sccache
@@ -383,6 +454,8 @@ jobs:
       SCCACHE_DIR: C:\sccache
 
     runs-on: windows-latest
+    needs: [rustfmt-clippy, msrv]
+
     steps:
       - uses: actions/checkout@v4
       - uses: ilammy/setup-nasm@v1

Cargo.lock

@@ -89,7 +89,7 @@ num-derive = "0.4"
 paste = "1.0"
 noop_proc_macro = "0.3.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
-dav1d-sys = { version = "0.6.0", package = "libdav1d-sys", optional = true }
+dav1d-sys = { version = "0.7.0", package = "libdav1d-sys", optional = true }
 aom-sys = { version = "0.3.3", optional = true }
 scan_fmt = { version = "0.2.6", optional = true, default-features = false }
 ivf = { version = "0.1", path = "ivf/", optional = true }
@@ -115,6 +115,7 @@ profiling = { version = "1" }
 tracing-subscriber = { version = "0.3.18", optional = true }
 tracing-chrome = { version = "0.7.1", optional = true }
 tracing = { version = "0.1.40", optional = true }
+aligned-vec = "0.5.0"
 
 [dependencies.image]
 version = "0.24.8"
@@ -135,8 +136,6 @@ features = ["parallel"]
 signal-hook = { version = "0.3", optional = true }
 
 [dev-dependencies]
-assert_cmd = "2.0"
-criterion = "0.5"
 pretty_assertions = "1.4.0"
 interpolate_name = "0.2.4"
 nom = "7.1.3"
@@ -145,6 +144,14 @@ rand = "0.8"
 rand_chacha = "0.3"
 semver = "1.0"
 
+# Exclude dependencies and features that don't work on wasm32:
+[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
+criterion = { version = "0.5", default-features = false }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+assert_cmd = "2.0"
+criterion = "0.5"
+
 [target.'cfg(fuzzing)'.dependencies]
 arbitrary = "1.3"
 interpolate_name = "0.2.4"

Cargo.toml

@@ -70,22 +70,25 @@ fn hash_changed(
 
 #[cfg(feature = "asm")]
 fn build_nasm_files() {
-  use std::fs::File;
-  use std::io::Write;
-  let out_dir = env::var("OUT_DIR").unwrap();
+  let mut config = "
+%pragma preproc sane_empty_expansion true
+%define private_prefix rav1e
+%define ARCH_X86_32 0
+%define ARCH_X86_64 1
+%define PIC 1
+%define STACK_ALIGNMENT 16
+%define HAVE_AVX512ICL 1
+"
+  .to_owned();
 
-  let dest_path = Path::new(&out_dir).join("config.asm");
-  let mut config_file = File::create(&dest_path).unwrap();
-  config_file.write(b"	%define private_prefix rav1e\n").unwrap();
-  config_file.write(b"	%define ARCH_X86_32 0\n").unwrap();
-  config_file.write(b" %define ARCH_X86_64 1\n").unwrap();
-  config_file.write(b"	%define PIC 1\n").unwrap();
-  config_file.write(b" %define STACK_ALIGNMENT 16\n").unwrap();
-  config_file.write(b" %define HAVE_AVX512ICL 1\n").unwrap();
   if env::var("CARGO_CFG_TARGET_VENDOR").unwrap() == "apple" {
-    config_file.write(b" %define PREFIX 1\n").unwrap();
+    config += "%define PREFIX 1\n";
   }
 
+  let out_dir = env::var("OUT_DIR").unwrap();
+  let dest_path = Path::new(&out_dir).join("config.asm");
+  std::fs::write(&dest_path, config).expect("can write config.asm");
+
   let asm_files = &[
     "src/x86/cdef_avx2.asm",
     "src/x86/cdef_avx512.asm",
@@ -132,20 +135,17 @@ fn build_nasm_files() {
   if let Some((hash, hash_path)) =
     hash_changed(asm_files, &out_dir, &dest_path)
   {
-    let mut config_include_arg = String::from("-I");
-    config_include_arg.push_str(&out_dir);
-    config_include_arg.push('/');
-    let mut nasm = nasm_rs::Build::new();
-    nasm.min_version(2, 14, 0);
-    for file in asm_files {
-      nasm.file(file);
-    }
-    nasm.flag(&config_include_arg);
-    nasm.flag("-Isrc/");
-    let obj = nasm.compile_objects().unwrap_or_else(|e| {
-      println!("cargo:warning={e}");
-      panic!("NASM build failed. Make sure you have nasm installed or disable the \"asm\" feature.\n\
-        You can get NASM from https://nasm.us or your system's package manager.\n\nerror: {e}");
+    let obj = nasm_rs::Build::new()
+      .min_version(2, 15, 0)
+      .include(&out_dir)
+      .include("src")
+      .files(asm_files)
+      .compile_objects()
+      .unwrap_or_else(|e| {
+        panic!("NASM build failed. Make sure you have nasm installed or disable the \"asm\" feature.\n\
+                You can get NASM from https://nasm.us or your system's package manager.\n\
+                \n\
+                error: {e}");
     });
 
     // cc is better at finding the correct archiver
@@ -196,21 +196,21 @@ fn strip_command() -> Option<String> {
 
 #[cfg(feature = "asm")]
 fn build_asm_files() {
-  use std::fs::File;
-  use std::io::Write;
-  let out_dir = env::var("OUT_DIR").unwrap();
+  let mut config = "
+#define PRIVATE_PREFIX rav1e_
+#define ARCH_AARCH64 1
+#define ARCH_ARM 0
+#define CONFIG_LOG 1
+#define HAVE_ASM 1
+"
+  .to_owned();
 
-  let dest_path = Path::new(&out_dir).join("config.h");
-  let mut config_file = File::create(&dest_path).unwrap();
   if env::var("CARGO_CFG_TARGET_VENDOR").unwrap() == "apple" {
-    config_file.write(b" #define PREFIX 1\n").unwrap();
+    config += "#define PREFIX 1\n";
   }
-  config_file.write(b" #define PRIVATE_PREFIX rav1e_\n").unwrap();
-  config_file.write(b" #define ARCH_AARCH64 1\n").unwrap();
-  config_file.write(b" #define ARCH_ARM 0\n").unwrap();
-  config_file.write(b" #define CONFIG_LOG 1 \n").unwrap();
-  config_file.write(b" #define HAVE_ASM 1\n").unwrap();
-  config_file.sync_all().unwrap();
+  let out_dir = env::var("OUT_DIR").unwrap();
+  let dest_path = Path::new(&out_dir).join("config.h");
+  std::fs::write(&dest_path, config).expect("can write config.h");
 
   let asm_files = &[
     "src/arm/64/cdef.S",

build.rs

@@ -1,16 +1,31 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     ":automergeAll",
     ":automergePr",
     ":automergeRequireAllStatusChecks",
     ":enableVulnerabilityAlerts",
     "group:allNonMajor",
     "schedule:earlyMondays"
   ],
-  "fetchReleaseNotes": true,
+  "fetchChangeLogs": "pr",
   "lockFileMaintenance": {
     "enabled": true
-  }
+  },
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "clap",
+        "clap_complete",
+        "clap_builder",
+        "clap_derive"
+      ],
+      "allowedVersions": "<=4.4"
+    },
+    {
+      "matchPackageNames": ["assert_cmd"],
+      "allowedVersions": "<=2.0.13"
+    }
+  ]
 }

renovate.json

@@ -106,11 +106,11 @@ struct RsqrtOutput {
 }
 
 /// Fixed point `rsqrt` for `ssim_boost`
-fn ssim_boost_rsqrt(x: u64) -> RsqrtOutput {
+const fn ssim_boost_rsqrt(x: u64) -> RsqrtOutput {
   const INSHIFT: u8 = 16;
   const OUTSHIFT: u8 = 14;
 
-  let k = ((ILog::ilog(x) - 1) >> 1) as i16;
+  let k = (x.ilog2() >> 1) as i16;
   /*t is x in the range [0.25, 1) in QINSHIFT, or x*2^(-s).
   Shift by log2(x) - log2(0.25*(1 << INSHIFT)) to ensure 0.25 lower bound.*/
   let s: i16 = 2 * k - (INSHIFT as i16 - 2);
@@ -140,7 +140,7 @@ fn ssim_boost_rsqrt(x: u64) -> RsqrtOutput {
   Coefficients here, and the final result r, are Q14. */
   let rsqrt: i32 = 23557 + mult16_16_q15(n, -13490 + mult16_16_q15(n, 6711));
 
-  debug_assert!((16384..32768).contains(&rsqrt));
+  debug_assert!(16384 <= rsqrt && rsqrt < 32768);
   RsqrtOutput { norm: rsqrt as u16, shift: rsqrt_shift }
 }
 
@@ -156,7 +156,7 @@ pub fn ssim_boost(svar: u32, dvar: u32, bit_depth: usize) -> DistortionScale {
 
 /// Apply ssim boost to a given input
 #[inline(always)]
-pub fn apply_ssim_boost(
+pub const fn apply_ssim_boost(
   input: u32, svar: u32, dvar: u32, bit_depth: usize,
 ) -> u32 {
   let coeff_shift = bit_depth - 8;

src/activity.rs

@@ -10,7 +10,6 @@
 #[cfg(test)]
 pub mod test {
   use crate::config::CpuFeatureLevel;
-  use crate::dist::rust;
   use crate::dist::*;
   use crate::frame::*;
   use crate::partition::BlockSize;