Skip to content

Use Dav1dSequenceHeader instead of Rav1dSequenceHeader #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrebelo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use Dav1dSequenceHeader instead of Rav1dSequenceHeader #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
209a437
Use Dav1dSequenceHeader instead of Rav1dSequenceHeader
jrebelo Jun 11, 2025
07bd0e8
Rust enums for more efficient type representation
jrebelo Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ use crate::include::common::intops::clip;
use crate::include::common::intops::clip_u8;
use crate::include::common::intops::iclip;
use crate::include::dav1d::common::Rav1dDataProps;
use crate::include::dav1d::headers::Dav1dSequenceHeader;
use crate::include::dav1d::headers::Rav1dFilterMode;
use crate::include::dav1d::headers::Rav1dFrameHeader;
use crate::include::dav1d::headers::Rav1dFrameHeaderTiling;
use crate::include::dav1d::headers::Rav1dPixelLayout;
use crate::include::dav1d::headers::Rav1dRestorationType;
use crate::include::dav1d::headers::Rav1dSequenceHeader;
use crate::include::dav1d::headers::Rav1dTxfmMode;
use crate::include::dav1d::headers::Rav1dWarpedMotionParams;
use crate::include::dav1d::headers::Rav1dWarpedMotionType;
Expand Down Expand Up @@ -178,7 +178,7 @@ use std::sync::atomic::Ordering;
use strum::EnumCount;

fn init_quant_tables(
seq_hdr: &Rav1dSequenceHeader,
seq_hdr: &Dav1dSequenceHeader,
frame_hdr: &Rav1dFrameHeader,
qidx: u8,
dq: &[[[RelaxedAtomic<u16>; 2]; 3]; SegmentId::COUNT],
Expand Down Expand Up @@ -1147,7 +1147,7 @@ fn decode_b(
bp: BlockPartition,
intra_edge_flags: EdgeFlags,
) -> Result<(), ()> {
let seq_hdr = &***f.seq_hdr.as_ref().unwrap();
let seq_hdr = &**f.seq_hdr.as_ref().unwrap();
use std::fmt;

/// Helper struct for printing a number as a signed hexidecimal value.
Expand Down Expand Up @@ -1788,7 +1788,7 @@ fn decode_b(

let mut y_mode = y_mode;
let mut y_angle = y_angle;
let seq_hdr = f.seq_hdr();
let seq_hdr = f.seq_hdr.as_ref().unwrap();
if y_mode == DC_PRED
&& pal_sz[0] == 0
&& cmp::max(b_dim[2], b_dim[3]) <= 3
Expand Down Expand Up @@ -3440,7 +3440,7 @@ fn decode_sb(
let have_h_split = f.bw > t.b.x + hsz;
let have_v_split = f.bh > t.b.y + hsz;

let sb128 = f.seq_hdr().sb128 != 0;
let sb128 = f.seq_hdr.as_ref().unwrap().sb128 != 0;
let intra_edge = &IntraEdges::DEFAULT;

if !have_h_split && !have_v_split {
Expand Down Expand Up @@ -3847,7 +3847,7 @@ static SS_SIZE_MUL: enum_map_ty!(Rav1dPixelLayout, [u8; 2]) = enum_map!(Rav1dPix
fn setup_tile(
c: &Rav1dContext,
ts: &mut Rav1dTileState,
seq_hdr: &Rav1dSequenceHeader,
seq_hdr: &Dav1dSequenceHeader,
frame_hdr: &Rav1dFrameHeader,
bitdepth_max: i32,
sb_shift: i32,
Expand Down Expand Up @@ -4100,7 +4100,7 @@ pub(crate) fn rav1d_decode_tile_sbrow(
t: &mut Rav1dTaskContext,
f: &Rav1dFrameData,
) -> Result<(), ()> {
let seq_hdr = &***f.seq_hdr.as_ref().unwrap();
let seq_hdr = &**f.seq_hdr.as_ref().unwrap();
let root_bl = if seq_hdr.sb128 != 0 {
BlockLevel::Bl128x128
} else {
Expand Down Expand Up @@ -4157,7 +4157,7 @@ pub(crate) fn rav1d_decode_tile_sbrow(
root_bl,
EdgeIndex::root(),
)?;
if t.b.x & 16 != 0 || f.seq_hdr().sb128 != 0 {
if t.b.x & 16 != 0 || f.seq_hdr.as_ref().unwrap().sb128 != 0 {
t.a += 1;
}
}
Expand Down Expand Up @@ -4272,13 +4272,13 @@ pub(crate) fn rav1d_decode_tile_sbrow(
root_bl,
EdgeIndex::root(),
)?;
if t.b.x & 16 != 0 || f.seq_hdr().sb128 != 0 {
if t.b.x & 16 != 0 || f.seq_hdr.as_ref().unwrap().sb128 != 0 {
t.a += 1;
t.lf_mask = t.lf_mask.map(|i| i + 1);
}
}

if f.seq_hdr().ref_frame_mvs != 0
if f.seq_hdr.as_ref().unwrap().ref_frame_mvs != 0
&& c.tc.len() > 1
&& f.frame_hdr().frame_type.is_inter_or_switch()
{
Expand Down Expand Up @@ -4366,7 +4366,7 @@ pub(crate) fn rav1d_decode_frame_init(c: &Rav1dContext, fc: &Rav1dFrameContext)

let num_sb128 = f.sb128w * f.sb128h;
let size_mul = &SS_SIZE_MUL[f.cur.p.layout];
let seq_hdr = &***f.seq_hdr.as_ref().unwrap();
let seq_hdr = &**f.seq_hdr.as_ref().unwrap();
let hbd = (seq_hdr.hbd != 0) as c_int;
if c.fc.len() > 1 {
let mut tile_idx = 0;
Expand Down Expand Up @@ -4709,7 +4709,7 @@ pub(crate) fn rav1d_decode_frame_init_cdf(
setup_tile(
c,
ts,
&***f.seq_hdr.as_ref().unwrap(),
&**f.seq_hdr.as_ref().unwrap(),
frame_hdr,
f.bitdepth_max,
f.sb_shift,
Expand Down Expand Up @@ -4786,7 +4786,7 @@ fn rav1d_decode_frame_main(c: &Rav1dContext, f: &mut Rav1dFrameData) -> Rav1dRes
let sbh_end = cmp::min(sbh_end.into(), f.sbh);

for sby in sbh_start.into()..sbh_end {
let seq_hdr = &***f.seq_hdr.as_ref().unwrap();
let seq_hdr = &**f.seq_hdr.as_ref().unwrap();
let frame_hdr = &***f.frame_hdr.as_ref().unwrap();
t.b.y = sby << 4 + seq_hdr.sb128;
let by_end = t.b.y + f.sb_step >> 1;
Expand Down
4 changes: 2 additions & 2 deletions src/fg_apply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ pub(crate) fn rav1d_apply_grain_row<BD: BitDepth>(
) {
// Synthesize grain for the affected planes
let GrainBD { grain_lut, scaling } = grain;
let seq_hdr = &***out.seq_hdr.as_ref().unwrap();
let seq_hdr = &**out.seq_hdr.as_ref().unwrap();
let frame_hdr = &***out.frame_hdr.as_ref().unwrap();
let data = &frame_hdr.film_grain.data;
let in_data = &r#in.data.as_ref().unwrap().data;
Expand All @@ -141,7 +141,7 @@ pub(crate) fn rav1d_apply_grain_row<BD: BitDepth>(
let ss_y = (r#in.p.layout == Rav1dPixelLayout::I420) as usize;
let ss_x = (r#in.p.layout != Rav1dPixelLayout::I444) as usize;
let cpw = w + ss_x >> ss_x;
let is_id = seq_hdr.mtrx == Rav1dMatrixCoefficients::IDENTITY;
let is_id = seq_hdr.mtrx == Rav1dMatrixCoefficients::IDENTITY.into();
let bitdepth_max = (1 << out.p.bpc) - 1;
let bd = BD::from_c(bitdepth_max);

Expand Down
Loading
Loading