Ensure default Rust compiler flags apply to the shared library build

0001-remove-unused-hawktracer-usage.patch

@@ -0,0 +1,435 @@
+From 0dc6dc69be65915666c3d70455d181d4d1b5b78c Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Mon, 8 Aug 2022 20:48:47 +0200
+Subject: [PATCH 1/3] remove unused hawktracer usage
+
+---
+ src/activity.rs        |  3 ---
+ src/api/internal.rs    |  9 ---------
+ src/api/lookahead.rs   |  5 -----
+ src/bin/muxer/ivf.rs   |  2 --
+ src/bin/rav1e-ch.rs    | 10 ----------
+ src/bin/rav1e.rs       | 10 ----------
+ src/bin/stats.rs       |  3 ---
+ src/cdef.rs            |  2 --
+ src/deblock.rs         |  4 ----
+ src/encoder.rs         |  3 ---
+ src/lrf.rs             |  2 --
+ src/me.rs              |  3 ---
+ src/scenechange/mod.rs |  5 -----
+ 13 files changed, 61 deletions(-)
+
+diff --git a/src/activity.rs b/src/activity.rs
+index 99d9137..7ebcd0e 100644
+--- a/src/activity.rs
++++ b/src/activity.rs
+@@ -12,7 +12,6 @@ use crate::rdo::{ssim_boost, DistortionScale};
+ use crate::tiling::*;
+ use crate::util::*;
+ use itertools::izip;
+-use rust_hawktracer::*;
+ 
+ #[derive(Debug, Default, Clone)]
+ pub struct ActivityMask {
+@@ -20,7 +19,6 @@ pub struct ActivityMask {
+ }
+ 
+ impl ActivityMask {
+-  #[hawktracer(activity_mask_from_plane)]
+   pub fn from_plane<T: Pixel>(luma_plane: &Plane<T>) -> ActivityMask {
+     let PlaneConfig { width, height, .. } = luma_plane.cfg;
+ 
+@@ -55,7 +53,6 @@ impl ActivityMask {
+     ActivityMask { variances: variances.into_boxed_slice() }
+   }
+ 
+-  #[hawktracer(activity_mask_fill_scales)]
+   pub fn fill_scales(
+     &self, bit_depth: usize, activity_scales: &mut Box<[DistortionScale]>,
+   ) {
+diff --git a/src/api/internal.rs b/src/api/internal.rs
+index c1613c8..5bfa3ab 100644
+--- a/src/api/internal.rs
++++ b/src/api/internal.rs
+@@ -27,7 +27,6 @@ use crate::stats::EncoderStats;
+ use crate::tiling::Area;
+ use crate::util::Pixel;
+ use arrayvec::ArrayVec;
+-use rust_hawktracer::*;
+ use std::cmp;
+ use std::collections::{BTreeMap, BTreeSet};
+ use std::env;
+@@ -312,7 +311,6 @@ impl<T: Pixel> ContextInner<T> {
+     }
+   }
+ 
+-  #[hawktracer(send_frame)]
+   pub fn send_frame(
+     &mut self, mut frame: Option<Arc<Frame<T>>>,
+     params: Option<FrameParameters>,
+@@ -591,7 +589,6 @@ impl<T: Pixel> ContextInner<T> {
+   /// `rec_buffer` and `lookahead_rec_buffer` on the `FrameInvariants`. This
+   /// function must be called after every new `FrameInvariants` is initially
+   /// computed.
+-  #[hawktracer(compute_lookahead_motion_vectors)]
+   fn compute_lookahead_motion_vectors(&mut self, output_frameno: u64) {
+     let qps = {
+       let frame_data = self.frame_data.get(&output_frameno).unwrap();
+@@ -752,7 +749,6 @@ impl<T: Pixel> ContextInner<T> {
+ 
+   /// Computes lookahead intra cost approximations and fills in
+   /// `lookahead_intra_costs` on the `FrameInvariants`.
+-  #[hawktracer(compute_lookahead_intra_costs)]
+   fn compute_lookahead_intra_costs(&mut self, output_frameno: u64) {
+     let frame_data = self.frame_data.get(&output_frameno).unwrap();
+     let fi = &frame_data.fi;
+@@ -774,7 +770,6 @@ impl<T: Pixel> ContextInner<T> {
+     );
+   }
+ 
+-  #[hawktracer(compute_keyframe_placement)]
+   pub fn compute_keyframe_placement(
+     &mut self, lookahead_frames: &[Arc<Frame<T>>],
+   ) {
+@@ -791,7 +786,6 @@ impl<T: Pixel> ContextInner<T> {
+     self.next_lookahead_frame += 1;
+   }
+ 
+-  #[hawktracer(compute_frame_invariants)]
+   pub fn compute_frame_invariants(&mut self) {
+     while self.set_frame_properties(self.next_lookahead_output_frameno).is_ok()
+     {
+@@ -804,7 +798,6 @@ impl<T: Pixel> ContextInner<T> {
+     }
+   }
+ 
+-  #[hawktracer(update_block_importances)]
+   fn update_block_importances(
+     fi: &FrameInvariants<T>, me_stats: &crate::me::FrameMEStats,
+     frame: &Frame<T>, reference_frame: &Frame<T>, bit_depth: usize,
+@@ -963,7 +956,6 @@ impl<T: Pixel> ContextInner<T> {
+   }
+ 
+   /// Computes the block importances for the current output frame.
+-  #[hawktracer(compute_block_importances)]
+   fn compute_block_importances(&mut self) {
+     // SEF don't need block importances.
+     if self.frame_data[&self.output_frameno].fi.show_existing_frame {
+@@ -1296,7 +1288,6 @@ impl<T: Pixel> ContextInner<T> {
+     }
+   }
+ 
+-  #[hawktracer(receive_packet)]
+   pub fn receive_packet(&mut self) -> Result<Packet<T>, EncoderStatus> {
+     if self.done_processing() {
+       return Err(EncoderStatus::LimitReached);
+diff --git a/src/api/lookahead.rs b/src/api/lookahead.rs
+index 690acd2..30297d3 100644
+--- a/src/api/lookahead.rs
++++ b/src/api/lookahead.rs
+@@ -14,7 +14,6 @@ use crate::rayon::iter::*;
+ use crate::tiling::{Area, TileRect};
+ use crate::transform::TxSize;
+ use crate::{Frame, Pixel};
+-use rust_hawktracer::*;
+ use std::sync::Arc;
+ use v_frame::pixel::CastFromPrimitive;
+ 
+@@ -24,7 +23,6 @@ pub(crate) const IMP_BLOCK_SIZE_IN_MV_UNITS: i64 =
+ pub(crate) const IMP_BLOCK_AREA_IN_MV_UNITS: i64 =
+   IMP_BLOCK_SIZE_IN_MV_UNITS * IMP_BLOCK_SIZE_IN_MV_UNITS;
+ 
+-#[hawktracer(estimate_intra_costs)]
+ pub(crate) fn estimate_intra_costs<T: Pixel>(
+   frame: &Frame<T>, bit_depth: usize, cpu_feature_level: CpuFeatureLevel,
+ ) -> Box<[u32]> {
+@@ -116,7 +114,6 @@ pub(crate) fn estimate_intra_costs<T: Pixel>(
+   intra_costs.into_boxed_slice()
+ }
+ 
+-#[hawktracer(estimate_importance_block_difference)]
+ pub(crate) fn estimate_importance_block_difference<T: Pixel>(
+   frame: Arc<Frame<T>>, ref_frame: Arc<Frame<T>>,
+ ) -> Box<[u32]> {
+@@ -174,7 +171,6 @@ pub(crate) fn estimate_importance_block_difference<T: Pixel>(
+   inter_costs.into_boxed_slice()
+ }
+ 
+-#[hawktracer(estimate_inter_costs)]
+ pub(crate) fn estimate_inter_costs<T: Pixel>(
+   frame: Arc<Frame<T>>, ref_frame: Arc<Frame<T>>, bit_depth: usize,
+   mut config: EncoderConfig, sequence: Arc<Sequence>,
+@@ -236,7 +232,6 @@ pub(crate) fn estimate_inter_costs<T: Pixel>(
+   inter_costs.into_boxed_slice()
+ }
+ 
+-#[hawktracer(compute_motion_vectors)]
+ pub(crate) fn compute_motion_vectors<T: Pixel>(
+   fi: &mut FrameInvariants<T>, fs: &mut FrameState<T>, inter_cfg: &InterConfig,
+ ) {
+diff --git a/src/bin/muxer/ivf.rs b/src/bin/muxer/ivf.rs
+index d89e541..2157a58 100644
+--- a/src/bin/muxer/ivf.rs
++++ b/src/bin/muxer/ivf.rs
+@@ -12,7 +12,6 @@ use super::Muxer;
+ use crate::error::*;
+ use ivf::*;
+ use rav1e::prelude::*;
+-use rust_hawktracer::*;
+ use std::fs;
+ use std::fs::File;
+ use std::io;
+@@ -37,7 +36,6 @@ impl Muxer for IvfMuxer {
+     );
+   }
+ 
+-  #[hawktracer(write_frame)]
+   fn write_frame(&mut self, pts: u64, data: &[u8], _frame_type: FrameType) {
+     write_ivf_frame(&mut self.output, pts, data);
+   }
+diff --git a/src/bin/rav1e-ch.rs b/src/bin/rav1e-ch.rs
+index d9081dd..80b6f9a 100644
+--- a/src/bin/rav1e-ch.rs
++++ b/src/bin/rav1e-ch.rs
+@@ -303,18 +303,8 @@ fn do_encode<T: Pixel, D: Decoder>(
+ }
+ 
+ fn main() -> Result<(), Box<dyn std::error::Error>> {
+-  #[cfg(feature = "tracing")]
+-  use rust_hawktracer::*;
+   init_logger();
+ 
+-  #[cfg(feature = "tracing")]
+-  let instance = HawktracerInstance::new();
+-  #[cfg(feature = "tracing")]
+-  let _listener = instance.create_listener(HawktracerListenerType::ToFile {
+-    file_path: "trace.bin".into(),
+-    buffer_size: 4096,
+-  });
+-
+   run().map_err(|e| {
+     error::print_error(&e);
+     Box::new(e) as Box<dyn std::error::Error>
+diff --git a/src/bin/rav1e.rs b/src/bin/rav1e.rs
+index da6d664..2d9eac3 100644
+--- a/src/bin/rav1e.rs
++++ b/src/bin/rav1e.rs
+@@ -295,18 +295,8 @@ fn do_encode<T: Pixel, D: Decoder>(
+ }
+ 
+ fn main() {
+-  #[cfg(feature = "tracing")]
+-  use rust_hawktracer::*;
+   init_logger();
+ 
+-  #[cfg(feature = "tracing")]
+-  let instance = HawktracerInstance::new();
+-  #[cfg(feature = "tracing")]
+-  let _listener = instance.create_listener(HawktracerListenerType::ToFile {
+-    file_path: "trace.bin".into(),
+-    buffer_size: 4096,
+-  });
+-
+   run().unwrap_or_else(|e| {
+     error::print_error(&e);
+     exit(1);
+diff --git a/src/bin/stats.rs b/src/bin/stats.rs
+index d363d0c..09e3b77 100644
+--- a/src/bin/stats.rs
++++ b/src/bin/stats.rs
+@@ -12,7 +12,6 @@ use rav1e::data::EncoderStats;
+ use rav1e::prelude::Rational;
+ use rav1e::prelude::*;
+ use rav1e::{Packet, Pixel};
+-use rust_hawktracer::*;
+ use std::fmt;
+ use std::time::Instant;
+ 
+@@ -30,7 +29,6 @@ pub struct FrameSummary {
+   pub enc_stats: EncoderStats,
+ }
+ 
+-#[hawktracer(build_frame_summary)]
+ pub fn build_frame_summary<T: Pixel>(
+   packets: Packet<T>, bit_depth: usize, chroma_sampling: ChromaSampling,
+   metrics_cli: MetricsEnabled,
+@@ -742,7 +740,6 @@ pub enum MetricsEnabled {
+   All,
+ }
+ 
+-#[hawktracer(calculate_frame_metrics)]
+ pub fn calculate_frame_metrics<T: Pixel>(
+   frame1: &Frame<T>, frame2: &Frame<T>, bit_depth: usize, cs: ChromaSampling,
+   metrics: MetricsEnabled,
+diff --git a/src/cdef.rs b/src/cdef.rs
+index 6eeddb0..26e8ae1 100644
+--- a/src/cdef.rs
++++ b/src/cdef.rs
+@@ -13,7 +13,6 @@ use crate::encoder::FrameInvariants;
+ use crate::frame::*;
+ use crate::tiling::*;
+ use crate::util::{clamp, msb, CastFromPrimitive, Pixel};
+-use rust_hawktracer::*;
+ 
+ use crate::cpu_features::CpuFeatureLevel;
+ use std::cmp;
+@@ -586,7 +585,6 @@ pub fn cdef_filter_superblock<T: Pixel>(
+ //   tile boundary), the filtering process ignores input pixels that
+ //   don't exist.
+ 
+-#[hawktracer(cdef_filter_tile)]
+ pub fn cdef_filter_tile<T: Pixel>(
+   fi: &FrameInvariants<T>, input: &Frame<T>, tb: &TileBlocks,
+   output: &mut TileMut<'_, T>,
+diff --git a/src/deblock.rs b/src/deblock.rs
+index ff70368..61b7cd4 100644
+--- a/src/deblock.rs
++++ b/src/deblock.rs
+@@ -17,7 +17,6 @@ use crate::quantize::*;
+ use crate::tiling::*;
+ use crate::util::{clamp, ILog, Pixel};
+ use crate::DeblockState;
+-use rust_hawktracer::*;
+ use std::cmp;
+ 
+ use crate::rayon::iter::*;
+@@ -1313,7 +1312,6 @@ fn sse_h_edge<T: Pixel>(
+ }
+ 
+ // Deblocks all edges, vertical and horizontal, in a single plane
+-#[hawktracer(deblock_plane)]
+ pub fn deblock_plane<T: Pixel>(
+   deblock: &DeblockState, p: &mut PlaneRegionMut<T>, pli: usize,
+   blocks: &TileBlocks, crop_w: usize, crop_h: usize, bd: usize,
+@@ -1563,7 +1561,6 @@ fn sse_plane<T: Pixel>(
+ }
+ 
+ // Deblocks all edges in all planes of a frame
+-#[hawktracer(deblock_filter_frame)]
+ pub fn deblock_filter_frame<T: Pixel>(
+   deblock: &DeblockState, tile: &mut TileMut<T>, blocks: &TileBlocks,
+   crop_w: usize, crop_h: usize, bd: usize, planes: usize,
+@@ -1641,7 +1638,6 @@ fn sse_optimize<T: Pixel>(
+   level
+ }
+ 
+-#[hawktracer(deblock_filter_optimize)]
+ pub fn deblock_filter_optimize<T: Pixel, U: Pixel>(
+   fi: &FrameInvariants<T>, rec: &Tile<U>, input: &Tile<U>,
+   blocks: &TileBlocks, crop_w: usize, crop_h: usize,
+diff --git a/src/encoder.rs b/src/encoder.rs
+index c0b31fa..5fc753f 100644
+--- a/src/encoder.rs
++++ b/src/encoder.rs
+@@ -48,7 +48,6 @@ use std::sync::Arc;
+ use std::{fmt, io, mem};
+ 
+ use crate::rayon::iter::*;
+-use rust_hawktracer::*;
+ 
+ #[allow(dead_code)]
+ #[derive(Debug, Clone, PartialEq)]
+@@ -2949,7 +2948,6 @@ fn get_initial_cdfcontext<T: Pixel>(fi: &FrameInvariants<T>) -> CDFContext {
+   cdf.unwrap_or_else(|| CDFContext::new(fi.base_q_idx))
+ }
+ 
+-#[hawktracer(encode_tile_group)]
+ fn encode_tile_group<T: Pixel>(
+   fi: &FrameInvariants<T>, fs: &mut FrameState<T>, inter_cfg: &InterConfig,
+ ) -> Vec<u8> {
+@@ -3181,7 +3179,6 @@ fn check_lf_queue<T: Pixel>(
+   }
+ }
+ 
+-#[hawktracer(encode_tile)]
+ fn encode_tile<'a, T: Pixel>(
+   fi: &FrameInvariants<T>, ts: &mut TileStateMut<'_, T>,
+   fc: &'a mut CDFContext, blocks: &'a mut TileBlocksMut<'a>,
+diff --git a/src/lrf.rs b/src/lrf.rs
+index 2fc3b33..4399c4c 100644
+--- a/src/lrf.rs
++++ b/src/lrf.rs
+@@ -23,7 +23,6 @@ use crate::frame::{
+ };
+ use crate::tiling::{Area, PlaneRegion, PlaneRegionMut, Rect};
+ use crate::util::{clamp, CastFromPrimitive, ILog, Pixel};
+-use rust_hawktracer::*;
+ 
+ use crate::api::SGRComplexityLevel;
+ use std::cmp;
+@@ -1461,7 +1460,6 @@ impl RestorationState {
+     }
+   }
+ 
+-  #[hawktracer(lrf_filter_frame)]
+   pub fn lrf_filter_frame<T: Pixel>(
+     &mut self, out: &mut Frame<T>, pre_cdef: &Frame<T>,
+     fi: &FrameInvariants<T>,
+diff --git a/src/me.rs b/src/me.rs
+index 6f849a4..7ed64e4 100644
+--- a/src/me.rs
++++ b/src/me.rs
+@@ -29,8 +29,6 @@ use crate::util::ILog;
+ use std::ops::{Index, IndexMut};
+ use std::sync::Arc;
+ 
+-use rust_hawktracer::*;
+-
+ #[derive(Debug, Copy, Clone, Default)]
+ pub struct MEStats {
+   pub mv: MotionVector,
+@@ -98,7 +96,6 @@ enum MVSamplingMode {
+   CORNER { right: bool, bottom: bool },
+ }
+ 
+-#[hawktracer(estimate_tile_motion)]
+ pub fn estimate_tile_motion<T: Pixel>(
+   fi: &FrameInvariants<T>, ts: &mut TileStateMut<'_, T>,
+   inter_cfg: &InterConfig,
+diff --git a/src/scenechange/mod.rs b/src/scenechange/mod.rs
+index 20479f0..126329d 100644
+--- a/src/scenechange/mod.rs
++++ b/src/scenechange/mod.rs
+@@ -14,7 +14,6 @@ use crate::encoder::Sequence;
+ use crate::frame::*;
+ use crate::sad_row;
+ use crate::util::Pixel;
+-use rust_hawktracer::*;
+ use std::sync::Arc;
+ use std::{cmp, u64};
+ 
+@@ -123,7 +122,6 @@ impl<T: Pixel> SceneChangeDetector<T> {
+   /// to the second frame in `frame_set`.
+   ///
+   /// This will gracefully handle the first frame in the video as well.
+-  #[hawktracer(analyze_next_frame)]
+   pub fn analyze_next_frame(
+     &mut self, frame_set: &[Arc<Frame<T>>], input_frameno: u64,
+     previous_keyframe: u64,
+@@ -345,7 +343,6 @@ impl<T: Pixel> SceneChangeDetector<T> {
+ 
+   /// The fast algorithm detects fast cuts using a raw difference
+   /// in pixel values between the scaled frames.
+-  #[hawktracer(fast_scenecut)]
+   fn fast_scenecut(
+     &mut self, frame1: Arc<Frame<T>>, frame2: Arc<Frame<T>>,
+   ) -> ScenecutResult {
+@@ -424,7 +421,6 @@ impl<T: Pixel> SceneChangeDetector<T> {
+   /// We gather both intra and inter costs for the frames,
+   /// as well as an importance-block-based difference,
+   /// and use all three metrics.
+-  #[hawktracer(cost_scenecut)]
+   fn cost_scenecut(
+     &self, frame1: Arc<Frame<T>>, frame2: Arc<Frame<T>>,
+   ) -> ScenecutResult {
+@@ -487,7 +483,6 @@ impl<T: Pixel> SceneChangeDetector<T> {
+   }
+ 
+   /// Calculates the average sum of absolute difference (SAD) per pixel between 2 planes
+-  #[hawktracer(delta_in_planes)]
+   fn delta_in_planes(&self, plane1: &Plane<T>, plane2: &Plane<T>) -> f64 {
+     let mut delta = 0;
+ 
+-- 
+2.39.2
+

0002-Fix-UB-in-pred_max-test.patch

@@ -0,0 +1,27 @@
+From c867cd96956a2c5034496362c4a530b97fefe4b8 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Fri, 13 Jan 2023 17:35:44 +0100
+Subject: [PATCH 2/3] Fix UB in pred_max test
+
+Backport of upstream commit:
+https://github.com/xiph/rav1e/commit/d56fe642bbbd8fe3d20c851b950db3fcaea53c7a
+---
+ src/predict.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/predict.rs b/src/predict.rs
+index 8e0108a..6058ccb 100644
+--- a/src/predict.rs
++++ b/src/predict.rs
+@@ -1542,7 +1542,7 @@ mod test {
+       }
+     }
+ 
+-    let above_left = unsafe { *above.as_ptr().offset(-1) };
++    let above_left = max12bit;
+ 
+     pred_paeth(
+       &mut o.as_region_mut(),
+-- 
+2.39.2
+

0003-Disambiguate-ILog-ilog-calls-from-integer-ilog-from-.patch

@@ -0,0 +1,164 @@
+From 81ec02d29afbfa503997a56d3fb7c3f039030d8d Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Fri, 17 Feb 2023 00:54:53 +0100
+Subject: [PATCH 3/3] Disambiguate ILog::ilog calls from {integer}::ilog from
+ Rust 1.67+
+
+---
+ src/deblock.rs           | 4 ++--
+ src/ec.rs                | 8 ++++----
+ src/encoder.rs           | 2 +-
+ src/lrf.rs               | 4 ++--
+ src/me.rs                | 2 +-
+ src/rate.rs              | 2 +-
+ src/transform/inverse.rs | 4 ++--
+ src/transform/mod.rs     | 2 +-
+ 8 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/deblock.rs b/src/deblock.rs
+index 61b7cd4..03048a5 100644
+--- a/src/deblock.rs
++++ b/src/deblock.rs
+@@ -1578,8 +1578,8 @@ fn sse_optimize<T: Pixel>(
+ ) -> [u8; 4] {
+   // i64 allows us to accumulate a total of ~ 35 bits worth of pixels
+   assert!(
+-    input.planes[0].plane_cfg.width.ilog()
+-      + input.planes[0].plane_cfg.height.ilog()
++    ILog::ilog(input.planes[0].plane_cfg.width)
++      + ILog::ilog(input.planes[0].plane_cfg.height)
+       < 35
+   );
+   let mut level = [0; 4];
+diff --git a/src/ec.rs b/src/ec.rs
+index 5d02ffd..c8abc62 100644
+--- a/src/ec.rs
++++ b/src/ec.rs
+@@ -192,7 +192,7 @@ impl StorageBackend for WriterBase<WriterCounter> {
+   #[inline]
+   fn store(&mut self, fl: u16, fh: u16, nms: u16) {
+     let (_l, r) = self.lr_compute(fl, fh, nms);
+-    let d = 16 - r.ilog();
++    let d = 16 - ILog::ilog(r);
+     let mut s = self.cnt + (d as i16);
+ 
+     self.s.bytes += (s >= 0) as usize + (s >= 8) as usize;
+@@ -230,7 +230,7 @@ impl StorageBackend for WriterBase<WriterRecorder> {
+   #[inline]
+   fn store(&mut self, fl: u16, fh: u16, nms: u16) {
+     let (_l, r) = self.lr_compute(fl, fh, nms);
+-    let d = 16 - r.ilog();
++    let d = 16 - ILog::ilog(r);
+     let mut s = self.cnt + (d as i16);
+ 
+     self.s.bytes += (s >= 0) as usize + (s >= 8) as usize;
+@@ -271,7 +271,7 @@ impl StorageBackend for WriterBase<WriterEncoder> {
+     let (l, r) = self.lr_compute(fl, fh, nms);
+     let mut low = l + self.s.low;
+     let mut c = self.cnt;
+-    let d = 16 - r.ilog();
++    let d = 16 - ILog::ilog(r);
+     let mut s = c + (d as i16);
+ 
+     if s >= 0 {
+@@ -584,7 +584,7 @@ where
+ 
+     // The 9 here counteracts the offset of -9 baked into cnt.  Don't include a termination bit.
+     let pre = Self::frac_compute((self.cnt + 9) as u32, self.rng as u32);
+-    let d = 16 - r.ilog();
++    let d = 16 - ILog::ilog(r);
+     let mut c = self.cnt;
+     let mut sh = c + (d as i16);
+     if sh >= 0 {
+diff --git a/src/encoder.rs b/src/encoder.rs
+index 5fc753f..b5995ed 100644
+--- a/src/encoder.rs
++++ b/src/encoder.rs
+@@ -3051,7 +3051,7 @@ fn encode_tile_group<T: Pixel>(
+     fs.cdfs.reset_counts();
+   }
+ 
+-  let max_tile_size_bytes = ((max_len.ilog() + 7) / 8) as u32;
++  let max_tile_size_bytes = ((ILog::ilog(max_len) + 7) / 8) as u32;
+   debug_assert!(max_tile_size_bytes > 0 && max_tile_size_bytes <= 4);
+   fs.max_tile_size_bytes = max_tile_size_bytes;
+ 
+diff --git a/src/lrf.rs b/src/lrf.rs
+index 4399c4c..bf59647 100644
+--- a/src/lrf.rs
++++ b/src/lrf.rs
+@@ -1408,8 +1408,8 @@ impl RestorationState {
+     }
+ 
+     // derive the rest
+-    let y_unit_log2 = y_unit_size.ilog() - 1;
+-    let uv_unit_log2 = uv_unit_size.ilog() - 1;
++    let y_unit_log2 = ILog::ilog(y_unit_size) - 1;
++    let uv_unit_log2 = ILog::ilog(uv_unit_size) - 1;
+     let y_cols = ((fi.width + (y_unit_size >> 1)) / y_unit_size).max(1);
+     let y_rows = ((fi.height + (y_unit_size >> 1)) / y_unit_size).max(1);
+     let uv_cols = ((((fi.width + (1 << xdec >> 1)) >> xdec)
+diff --git a/src/me.rs b/src/me.rs
+index 7ed64e4..3acdb07 100644
+--- a/src/me.rs
++++ b/src/me.rs
+@@ -1065,7 +1065,7 @@ fn get_mv_rate(
+   #[inline(always)]
+   fn diff_to_rate(diff: i16, allow_high_precision_mv: bool) -> u32 {
+     let d = if allow_high_precision_mv { diff } else { diff >> 1 };
+-    2 * d.abs().ilog() as u32
++    2 * ILog::ilog(d.abs()) as u32
+   }
+ 
+   diff_to_rate(a.row - b.row, allow_high_precision_mv)
+diff --git a/src/rate.rs b/src/rate.rs
+index 6bc23f3..1a94f08 100644
+--- a/src/rate.rs
++++ b/src/rate.rs
+@@ -234,7 +234,7 @@ fn blog64(w: i64) -> i64 {
+   if w <= 0 {
+     return -1;
+   }
+-  let ipart = w.ilog() as i32 - 1;
++  let ipart = ILog::ilog(w) as i32 - 1;
+   if ipart > 61 {
+     w >>= ipart - 61;
+   } else {
+diff --git a/src/transform/inverse.rs b/src/transform/inverse.rs
+index 3bf3286..813c784 100644
+--- a/src/transform/inverse.rs
++++ b/src/transform/inverse.rs
+@@ -1608,7 +1608,7 @@ pub(crate) mod rust {
+ 
+     // perform inv txfm on every row
+     let range = bd + 8;
+-    let txfm_fn = INV_TXFM_FNS[tx_types_1d.1 as usize][width.ilog() - 3];
++    let txfm_fn = INV_TXFM_FNS[tx_types_1d.1 as usize][ILog::ilog(width) - 3];
+     // 64 point transforms only signal 32 coeffs. We only take chunks of 32
+     //   and skip over the last 32 transforms here.
+     for (r, buffer_slice) in (0..height.min(32)).zip(buffer.chunks_mut(width))
+@@ -1634,7 +1634,7 @@ pub(crate) mod rust {
+ 
+     // perform inv txfm on every col
+     let range = cmp::max(bd + 6, 16);
+-    let txfm_fn = INV_TXFM_FNS[tx_types_1d.0 as usize][height.ilog() - 3];
++    let txfm_fn = INV_TXFM_FNS[tx_types_1d.0 as usize][ILog::ilog(height) - 3];
+     for c in 0..width {
+       let mut temp_in: [i32; 64] = [0; 64];
+       let mut temp_out: [i32; 64] = [0; 64];
+diff --git a/src/transform/mod.rs b/src/transform/mod.rs
+index 304df73..96e9457 100644
+--- a/src/transform/mod.rs
++++ b/src/transform/mod.rs
+@@ -288,7 +288,7 @@ pub enum TxSet {
+ #[inline]
+ pub fn get_rect_tx_log_ratio(col: usize, row: usize) -> i8 {
+   debug_assert!(col > 0 && row > 0);
+-  col.ilog() as i8 - row.ilog() as i8
++  ILog::ilog(col) as i8 - ILog::ilog(row) as i8
+ }
+ 
+ // performs half a butterfly
+-- 
+2.39.2
+

rust-rav1e.spec

@@ -29,6 +29,14 @@ Source:         %{crates_source}
 # * Remove fuzzing dependencies
 # * Bump system-deps dependency from 3.1.2 to 6
 Patch0:         rav1e-fix-metadata.diff
+# * Remove useless / no-op hawktracer macros
+Patch:          0001-remove-unused-hawktracer-usage.patch
+# * Backported patch to fix UB / crash in test code
+#   https://github.com/xiph/rav1e/commit/d56fe64:
+Patch:          0002-Fix-UB-in-pred_max-test.patch
+# * Disambiguate code which is ambiguous with Rust 1.67+ due to the
+#   stabilization of {integer}::ilog
+Patch:          0003-Disambiguate-ILog-ilog-calls-from-integer-ilog-from-.patch
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -571,7 +579,7 @@ echo "cargo-c"
 
 %build
 %cargo_build
-cargo cbuild --release \
+%__cargo cbuild --release \
     --destdir=%{buildroot} \
     --prefix=%{_prefix} \
     --libdir=%{_libdir} \
@@ -580,7 +588,7 @@ cargo cbuild --release \
 
 %install
 %cargo_install
-cargo cinstall --release \
+%__cargo cinstall --release \
     --destdir=%{buildroot} \
     --prefix=%{_prefix} \
     --libdir=%{_libdir} \