Skip to content

Commit

Permalink
Rename the unnamed types in Av1Block (#106)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkysen
kkysen authored Apr 12, 2023
2 parents 85a4f5e + dd7d7be commit f7e8b35
Show file tree
Hide file tree
Showing 15 changed files with 182 additions and 182 deletions.
24 changes: 12 additions & 12 deletions src/cdef_apply_tmpl_16.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,18 +300,18 @@ pub struct Av1Block {
pub skip_mode: uint8_t,
pub skip: uint8_t,
pub uvtx: uint8_t,
pub c2rust_unnamed: C2RustUnnamed_3,
pub c2rust_unnamed: Av1Block_intra_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_3 {
pub c2rust_unnamed: C2RustUnnamed_9,
pub c2rust_unnamed_0: C2RustUnnamed_4,
pub union Av1Block_intra_inter {
pub c2rust_unnamed: Av1Block_intra,
pub c2rust_unnamed_0: Av1Block_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_4 {
pub c2rust_unnamed: C2RustUnnamed_5,
pub struct Av1Block_inter {
pub c2rust_unnamed: Av1Block_inter_nd,
pub comp_type: uint8_t,
pub inter_mode: uint8_t,
pub motion_mode: uint8_t,
Expand All @@ -325,29 +325,29 @@ pub struct C2RustUnnamed_4 {
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_5 {
pub c2rust_unnamed: C2RustUnnamed_8,
pub c2rust_unnamed_0: C2RustUnnamed_6,
pub union Av1Block_inter_nd {
pub c2rust_unnamed: Av1Block_inter_1d,
pub c2rust_unnamed_0: Av1Block_inter_2d,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_6 {
pub struct Av1Block_inter_2d {
pub mv2d: mv,
pub matrix: [int16_t; 4],
}
use crate::src::levels::mv;

#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_8 {
pub struct Av1Block_inter_1d {
pub mv: [mv; 2],
pub wedge_idx: uint8_t,
pub mask_sign: uint8_t,
pub interintra_mode: uint8_t,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_9 {
pub struct Av1Block_intra {
pub y_mode: uint8_t,
pub uv_mode: uint8_t,
pub tx: uint8_t,
Expand Down
24 changes: 12 additions & 12 deletions src/cdef_apply_tmpl_8.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,18 +301,18 @@ pub struct Av1Block {
pub skip_mode: uint8_t,
pub skip: uint8_t,
pub uvtx: uint8_t,
pub c2rust_unnamed: C2RustUnnamed_21,
pub c2rust_unnamed: Av1Block_intra_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_21 {
pub c2rust_unnamed: C2RustUnnamed_27,
pub c2rust_unnamed_0: C2RustUnnamed_22,
pub union Av1Block_intra_inter {
pub c2rust_unnamed: Av1Block_intra,
pub c2rust_unnamed_0: Av1Block_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_22 {
pub c2rust_unnamed: C2RustUnnamed_23,
pub struct Av1Block_inter {
pub c2rust_unnamed: Av1Block_inter_nd,
pub comp_type: uint8_t,
pub inter_mode: uint8_t,
pub motion_mode: uint8_t,
Expand All @@ -326,29 +326,29 @@ pub struct C2RustUnnamed_22 {
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_23 {
pub c2rust_unnamed: C2RustUnnamed_26,
pub c2rust_unnamed_0: C2RustUnnamed_24,
pub union Av1Block_inter_nd {
pub c2rust_unnamed: Av1Block_inter_1d,
pub c2rust_unnamed_0: Av1Block_inter_2d,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_24 {
pub struct Av1Block_inter_2d {
pub mv2d: mv,
pub matrix: [int16_t; 4],
}
use crate::src::levels::mv;

#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_26 {
pub struct Av1Block_inter_1d {
pub mv: [mv; 2],
pub wedge_idx: uint8_t,
pub mask_sign: uint8_t,
pub interintra_mode: uint8_t,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_27 {
pub struct Av1Block_intra {
pub y_mode: uint8_t,
pub uv_mode: uint8_t,
pub tx: uint8_t,
Expand Down
24 changes: 12 additions & 12 deletions src/cdf.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,18 +311,18 @@ pub struct Av1Block {
pub skip_mode: uint8_t,
pub skip: uint8_t,
pub uvtx: uint8_t,
pub c2rust_unnamed: C2RustUnnamed_3,
pub c2rust_unnamed: Av1Block_intra_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_3 {
pub c2rust_unnamed: C2RustUnnamed_9,
pub c2rust_unnamed_0: C2RustUnnamed_4,
pub union Av1Block_intra_inter {
pub c2rust_unnamed: Av1Block_intra,
pub c2rust_unnamed_0: Av1Block_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_4 {
pub c2rust_unnamed: C2RustUnnamed_5,
pub struct Av1Block_inter {
pub c2rust_unnamed: Av1Block_inter_nd,
pub comp_type: uint8_t,
pub inter_mode: uint8_t,
pub motion_mode: uint8_t,
Expand All @@ -336,29 +336,29 @@ pub struct C2RustUnnamed_4 {
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_5 {
pub c2rust_unnamed: C2RustUnnamed_8,
pub c2rust_unnamed_0: C2RustUnnamed_6,
pub union Av1Block_inter_nd {
pub c2rust_unnamed: Av1Block_inter_1d,
pub c2rust_unnamed_0: Av1Block_inter_2d,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_6 {
pub struct Av1Block_inter_2d {
pub mv2d: mv,
pub matrix: [int16_t; 4],
}
use crate::src::levels::mv;

#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_8 {
pub struct Av1Block_inter_1d {
pub mv: [mv; 2],
pub wedge_idx: uint8_t,
pub mask_sign: uint8_t,
pub interintra_mode: uint8_t,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_9 {
pub struct Av1Block_intra {
pub y_mode: uint8_t,
pub uv_mode: uint8_t,
pub tx: uint8_t,
Expand Down
28 changes: 14 additions & 14 deletions src/decode.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,18 +662,18 @@ pub struct Av1Block {
pub skip_mode: uint8_t,
pub skip: uint8_t,
pub uvtx: uint8_t,
pub c2rust_unnamed: C2RustUnnamed_3,
pub c2rust_unnamed: Av1Block_intra_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_3 {
pub c2rust_unnamed: C2RustUnnamed_9,
pub c2rust_unnamed_0: C2RustUnnamed_4,
pub union Av1Block_intra_inter {
pub c2rust_unnamed: Av1Block_intra,
pub c2rust_unnamed_0: Av1Block_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_4 {
pub c2rust_unnamed: C2RustUnnamed_5,
pub struct Av1Block_inter {
pub c2rust_unnamed: Av1Block_inter_nd,
pub comp_type: uint8_t,
pub inter_mode: uint8_t,
pub motion_mode: uint8_t,
Expand All @@ -687,29 +687,29 @@ pub struct C2RustUnnamed_4 {
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_5 {
pub c2rust_unnamed: C2RustUnnamed_8,
pub c2rust_unnamed_0: C2RustUnnamed_6,
pub union Av1Block_inter_nd {
pub c2rust_unnamed: Av1Block_inter_1d,
pub c2rust_unnamed_0: Av1Block_inter_2d,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_6 {
pub struct Av1Block_inter_2d {
pub mv2d: mv,
pub matrix: [int16_t; 4],
}
use crate::src::levels::mv;
use crate::src::levels::mv_xy;
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_8 {
pub struct Av1Block_inter_1d {
pub mv: [mv; 2],
pub wedge_idx: uint8_t,
pub mask_sign: uint8_t,
pub interintra_mode: uint8_t,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_9 {
pub struct Av1Block_intra {
pub y_mode: uint8_t,
pub uv_mode: uint8_t,
pub tx: uint8_t,
Expand Down Expand Up @@ -5014,8 +5014,8 @@ unsafe extern "C" fn decode_b(
skip_mode: 0,
skip: 0,
uvtx: 0,
c2rust_unnamed: C2RustUnnamed_3 {
c2rust_unnamed: C2RustUnnamed_9 {
c2rust_unnamed: Av1Block_intra_inter {
c2rust_unnamed: Av1Block_intra {
y_mode: 0,
uv_mode: 0,
tx: 0,
Expand Down
24 changes: 12 additions & 12 deletions src/lf_apply_tmpl_16.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,18 +300,18 @@ pub struct Av1Block {
pub skip_mode: uint8_t,
pub skip: uint8_t,
pub uvtx: uint8_t,
pub c2rust_unnamed: C2RustUnnamed_3,
pub c2rust_unnamed: Av1Block_intra_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_3 {
pub c2rust_unnamed: C2RustUnnamed_9,
pub c2rust_unnamed_0: C2RustUnnamed_4,
pub union Av1Block_intra_inter {
pub c2rust_unnamed: Av1Block_intra,
pub c2rust_unnamed_0: Av1Block_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_4 {
pub c2rust_unnamed: C2RustUnnamed_5,
pub struct Av1Block_inter {
pub c2rust_unnamed: Av1Block_inter_nd,
pub comp_type: uint8_t,
pub inter_mode: uint8_t,
pub motion_mode: uint8_t,
Expand All @@ -325,29 +325,29 @@ pub struct C2RustUnnamed_4 {
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_5 {
pub c2rust_unnamed: C2RustUnnamed_8,
pub c2rust_unnamed_0: C2RustUnnamed_6,
pub union Av1Block_inter_nd {
pub c2rust_unnamed: Av1Block_inter_1d,
pub c2rust_unnamed_0: Av1Block_inter_2d,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_6 {
pub struct Av1Block_inter_2d {
pub mv2d: mv,
pub matrix: [int16_t; 4],
}
use crate::src::levels::mv;

#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_8 {
pub struct Av1Block_inter_1d {
pub mv: [mv; 2],
pub wedge_idx: uint8_t,
pub mask_sign: uint8_t,
pub interintra_mode: uint8_t,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_9 {
pub struct Av1Block_intra {
pub y_mode: uint8_t,
pub uv_mode: uint8_t,
pub tx: uint8_t,
Expand Down
24 changes: 12 additions & 12 deletions src/lf_apply_tmpl_8.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,18 +301,18 @@ pub struct Av1Block {
pub skip_mode: uint8_t,
pub skip: uint8_t,
pub uvtx: uint8_t,
pub c2rust_unnamed: C2RustUnnamed_21,
pub c2rust_unnamed: Av1Block_intra_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_21 {
pub c2rust_unnamed: C2RustUnnamed_27,
pub c2rust_unnamed_0: C2RustUnnamed_22,
pub union Av1Block_intra_inter {
pub c2rust_unnamed: Av1Block_intra,
pub c2rust_unnamed_0: Av1Block_inter,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_22 {
pub c2rust_unnamed: C2RustUnnamed_23,
pub struct Av1Block_inter {
pub c2rust_unnamed: Av1Block_inter_nd,
pub comp_type: uint8_t,
pub inter_mode: uint8_t,
pub motion_mode: uint8_t,
Expand All @@ -326,29 +326,29 @@ pub struct C2RustUnnamed_22 {
}
#[derive(Copy, Clone)]
#[repr(C)]
pub union C2RustUnnamed_23 {
pub c2rust_unnamed: C2RustUnnamed_26,
pub c2rust_unnamed_0: C2RustUnnamed_24,
pub union Av1Block_inter_nd {
pub c2rust_unnamed: Av1Block_inter_1d,
pub c2rust_unnamed_0: Av1Block_inter_2d,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_24 {
pub struct Av1Block_inter_2d {
pub mv2d: mv,
pub matrix: [int16_t; 4],
}
use crate::src::levels::mv;

#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_26 {
pub struct Av1Block_inter_1d {
pub mv: [mv; 2],
pub wedge_idx: uint8_t,
pub mask_sign: uint8_t,
pub interintra_mode: uint8_t,
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct C2RustUnnamed_27 {
pub struct Av1Block_intra {
pub y_mode: uint8_t,
pub uv_mode: uint8_t,
pub tx: uint8_t,
Expand Down
Loading

0 comments on commit f7e8b35

Please sign in to comment.