diff --git a/include/dav1d/headers.rs b/include/dav1d/headers.rs
index e6a6a0df2..ecbf4d6eb 100644
--- a/include/dav1d/headers.rs
+++ b/include/dav1d/headers.rs
@@ -543,38 +543,67 @@ pub(crate) const RAV1D_TRC_UNKNOWN: Rav1dTransferCharacteristics = DAV1D_TRC_UNK
 pub(crate) const _RAV1D_TRC_BT709: Rav1dTransferCharacteristics = DAV1D_TRC_BT709;
 
 pub type Dav1dMatrixCoefficients = c_uint;
+pub const DAV1D_MC_IDENTITY: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::IDENTITY.to_dav1d();
+pub const DAV1D_MC_BT709: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::BT709.to_dav1d();
+pub const DAV1D_MC_UNKNOWN: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::UNKNOWN.to_dav1d();
+pub const DAV1D_MC_FCC: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::FCC.to_dav1d();
+pub const DAV1D_MC_BT470BG: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::BT470BG.to_dav1d();
+pub const DAV1D_MC_BT601: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::BT601.to_dav1d();
+pub const DAV1D_MC_SMPTE240: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::SMPTE240.to_dav1d();
+pub const DAV1D_MC_SMPTE_YCGCO: Dav1dMatrixCoefficients =
+    Rav1dMatrixCoefficients::SMPTE_YCGCO.to_dav1d();
+pub const DAV1D_MC_BT2020_NCL: Dav1dMatrixCoefficients =
+    Rav1dMatrixCoefficients::BT2020_CL.to_dav1d();
+pub const DAV1D_MC_BT2020_CL: Dav1dMatrixCoefficients =
+    Rav1dMatrixCoefficients::BT2020_CL.to_dav1d();
+pub const DAV1D_MC_SMPTE2085: Dav1dMatrixCoefficients =
+    Rav1dMatrixCoefficients::SMPTE2085.to_dav1d();
+pub const DAV1D_MC_CHROMAT_NCL: Dav1dMatrixCoefficients =
+    Rav1dMatrixCoefficients::CHROMAT_NCL.to_dav1d();
+pub const DAV1D_MC_CHROMAT_CL: Dav1dMatrixCoefficients =
+    Rav1dMatrixCoefficients::CHROMAT_CL.to_dav1d();
+pub const DAV1D_MC_ICTCP: Dav1dMatrixCoefficients = Rav1dMatrixCoefficients::ICTCP.to_dav1d();
+// dav1d defines this value as 255, but the specification defines it as 3
 pub const DAV1D_MC_RESERVED: Dav1dMatrixCoefficients = 255;
-pub const DAV1D_MC_ICTCP: Dav1dMatrixCoefficients = 14;
-pub const DAV1D_MC_CHROMAT_CL: Dav1dMatrixCoefficients = 13;
-pub const DAV1D_MC_CHROMAT_NCL: Dav1dMatrixCoefficients = 12;
-pub const DAV1D_MC_SMPTE2085: Dav1dMatrixCoefficients = 11;
-pub const DAV1D_MC_BT2020_CL: Dav1dMatrixCoefficients = 10;
-pub const DAV1D_MC_BT2020_NCL: Dav1dMatrixCoefficients = 9;
-pub const DAV1D_MC_SMPTE_YCGCO: Dav1dMatrixCoefficients = 8;
-pub const DAV1D_MC_SMPTE240: Dav1dMatrixCoefficients = 7;
-pub const DAV1D_MC_BT601: Dav1dMatrixCoefficients = 6;
-pub const DAV1D_MC_BT470BG: Dav1dMatrixCoefficients = 5;
-pub const DAV1D_MC_FCC: Dav1dMatrixCoefficients = 4;
-pub const DAV1D_MC_UNKNOWN: Dav1dMatrixCoefficients = 2;
-pub const DAV1D_MC_BT709: Dav1dMatrixCoefficients = 1;
-pub const DAV1D_MC_IDENTITY: Dav1dMatrixCoefficients = 0;
-
-pub(crate) type Rav1dMatrixCoefficients = c_uint;
-pub(crate) const _RAV1D_MC_RESERVED: Rav1dMatrixCoefficients = DAV1D_MC_RESERVED;
-pub(crate) const _RAV1D_MC_ICTCP: Rav1dMatrixCoefficients = DAV1D_MC_ICTCP;
-pub(crate) const _RAV1D_MC_CHROMAT_CL: Rav1dMatrixCoefficients = DAV1D_MC_CHROMAT_CL;
-pub(crate) const _RAV1D_MC_CHROMAT_NCL: Rav1dMatrixCoefficients = DAV1D_MC_CHROMAT_NCL;
-pub(crate) const _RAV1D_MC_SMPTE2085: Rav1dMatrixCoefficients = DAV1D_MC_SMPTE2085;
-pub(crate) const _RAV1D_MC_BT2020_CL: Rav1dMatrixCoefficients = DAV1D_MC_BT2020_CL;
-pub(crate) const _RAV1D_MC_BT2020_NCL: Rav1dMatrixCoefficients = DAV1D_MC_BT2020_NCL;
-pub(crate) const _RAV1D_MC_SMPTE_YCGCO: Rav1dMatrixCoefficients = DAV1D_MC_SMPTE_YCGCO;
-pub(crate) const _RAV1D_MC_SMPTE240: Rav1dMatrixCoefficients = DAV1D_MC_SMPTE240;
-pub(crate) const _RAV1D_MC_BT601: Rav1dMatrixCoefficients = DAV1D_MC_BT601;
-pub(crate) const _RAV1D_MC_BT470BG: Rav1dMatrixCoefficients = DAV1D_MC_BT470BG;
-pub(crate) const _RAV1D_MC_FCC: Rav1dMatrixCoefficients = DAV1D_MC_FCC;
-pub(crate) const RAV1D_MC_UNKNOWN: Rav1dMatrixCoefficients = DAV1D_MC_UNKNOWN;
-pub(crate) const _RAV1D_MC_BT709: Rav1dMatrixCoefficients = DAV1D_MC_BT709;
-pub(crate) const RAV1D_MC_IDENTITY: Rav1dMatrixCoefficients = DAV1D_MC_IDENTITY;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub struct Rav1dMatrixCoefficients(pub u8);
+
+impl Rav1dMatrixCoefficients {
+    pub const IDENTITY: Self = Self(0);
+    pub const BT709: Self = Self(1);
+    pub const UNKNOWN: Self = Self(2);
+    pub const RESERVED: Self = Self(3);
+    pub const FCC: Self = Self(4);
+    pub const BT470BG: Self = Self(5);
+    pub const BT601: Self = Self(6);
+    pub const SMPTE240: Self = Self(7);
+    pub const SMPTE_YCGCO: Self = Self(8);
+    pub const BT2020_NCL: Self = Self(9);
+    pub const BT2020_CL: Self = Self(10);
+    pub const SMPTE2085: Self = Self(11);
+    pub const CHROMAT_NCL: Self = Self(12);
+    pub const CHROMAT_CL: Self = Self(13);
+    pub const ICTCP: Self = Self(14);
+
+    const fn to_dav1d(self) -> Dav1dMatrixCoefficients {
+        self.0 as Dav1dMatrixCoefficients
+    }
+}
+
+impl From<Rav1dMatrixCoefficients> for Dav1dMatrixCoefficients {
+    fn from(value: Rav1dMatrixCoefficients) -> Self {
+        value.to_dav1d()
+    }
+}
+
+impl TryFrom<Dav1dMatrixCoefficients> for Rav1dMatrixCoefficients {
+    type Error = ();
+
+    fn try_from(value: Dav1dMatrixCoefficients) -> Result<Self, Self::Error> {
+        u8::try_from(value).map(Self).map_err(|_| ())
+    }
+}
 
 pub type Dav1dChromaSamplePosition = c_uint;
 pub const DAV1D_CHR_UNKNOWN: Dav1dChromaSamplePosition =
@@ -1097,7 +1126,7 @@ impl From<Dav1dSequenceHeader> for Rav1dSequenceHeader {
             layout: layout.try_into().unwrap(),
             pri,
             trc,
-            mtrx,
+            mtrx: mtrx.try_into().unwrap(),
             chr: chr.try_into().unwrap(),
             hbd,
             color_range,
@@ -1212,7 +1241,7 @@ impl From<Rav1dSequenceHeader> for Dav1dSequenceHeader {
             layout: layout.into(),
             pri,
             trc,
-            mtrx,
+            mtrx: mtrx.into(),
             chr: chr.into(),
             hbd,
             color_range,
diff --git a/src/fg_apply.rs b/src/fg_apply.rs
index ded5eab52..3976d0a29 100644
--- a/src/fg_apply.rs
+++ b/src/fg_apply.rs
@@ -1,7 +1,7 @@
 use crate::include::common::bitdepth::BitDepth;
 use crate::include::common::bitdepth::BPC;
+use crate::include::dav1d::headers::Rav1dMatrixCoefficients;
 use crate::include::dav1d::headers::Rav1dPixelLayout;
-use crate::include::dav1d::headers::RAV1D_MC_IDENTITY;
 use crate::include::dav1d::picture::Rav1dPicture;
 use crate::src::align::ArrayDefault;
 use crate::src::filmgrain::Rav1dFilmGrainDSPContext;
@@ -187,7 +187,7 @@ pub(crate) unsafe 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 = out.p.w as usize + ss_x >> ss_x;
-    let is_id = seq_hdr.mtrx == RAV1D_MC_IDENTITY;
+    let is_id = seq_hdr.mtrx == Rav1dMatrixCoefficients::IDENTITY;
     let luma_src = (r#in.data.data[0] as *mut BD::Pixel)
         .offset(((row * 32) as isize * BD::pxstride(r#in.stride[0])) as isize);
     let bitdepth_max = (1 << out.p.bpc) - 1;
diff --git a/src/obu.rs b/src/obu.rs
index ddadb702e..a914d43a8 100644
--- a/src/obu.rs
+++ b/src/obu.rs
@@ -49,8 +49,6 @@ use crate::include::dav1d::headers::RAV1D_MAX_CDEF_STRENGTHS;
 use crate::include::dav1d::headers::RAV1D_MAX_OPERATING_POINTS;
 use crate::include::dav1d::headers::RAV1D_MAX_TILE_COLS;
 use crate::include::dav1d::headers::RAV1D_MAX_TILE_ROWS;
-use crate::include::dav1d::headers::RAV1D_MC_IDENTITY;
-use crate::include::dav1d::headers::RAV1D_MC_UNKNOWN;
 use crate::include::dav1d::headers::RAV1D_PRIMARY_REF_NONE;
 use crate::include::dav1d::headers::RAV1D_REFS_PER_FRAME;
 use crate::include::dav1d::headers::RAV1D_TRC_SRGB;
@@ -392,11 +390,11 @@ fn parse_seq_hdr(c: &mut Rav1dContext, gb: &mut GetBits) -> Rav1dResult<Rav1dSeq
     if color_description_present != 0 {
         pri = gb.get_bits(8) as Rav1dColorPrimaries;
         trc = gb.get_bits(8) as Rav1dTransferCharacteristics;
-        mtrx = gb.get_bits(8) as Rav1dMatrixCoefficients;
+        mtrx = Rav1dMatrixCoefficients(gb.get_bits(8) as u8)
     } else {
         pri = RAV1D_COLOR_PRI_UNKNOWN;
         trc = RAV1D_TRC_UNKNOWN;
-        mtrx = RAV1D_MC_UNKNOWN;
+        mtrx = Rav1dMatrixCoefficients::UNKNOWN;
     }
     let color_range;
     let layout;
@@ -409,7 +407,10 @@ fn parse_seq_hdr(c: &mut Rav1dContext, gb: &mut GetBits) -> Rav1dResult<Rav1dSeq
         ss_ver = 1;
         ss_hor = ss_ver;
         chr = Rav1dChromaSamplePosition::Unknown;
-    } else if pri == RAV1D_COLOR_PRI_BT709 && trc == RAV1D_TRC_SRGB && mtrx == RAV1D_MC_IDENTITY {
+    } else if pri == RAV1D_COLOR_PRI_BT709
+        && trc == RAV1D_TRC_SRGB
+        && mtrx == Rav1dMatrixCoefficients::IDENTITY
+    {
         layout = Rav1dPixelLayout::I444;
         color_range = 1;
         if profile != Rav1dProfile::High && !(profile == Rav1dProfile::Professional && hbd == 2) {
@@ -467,7 +468,10 @@ fn parse_seq_hdr(c: &mut Rav1dContext, gb: &mut GetBits) -> Rav1dResult<Rav1dSeq
             Rav1dChromaSamplePosition::Unknown
         };
     }
-    if c.strict_std_compliance && mtrx == RAV1D_MC_IDENTITY && layout != Rav1dPixelLayout::I444 {
+    if c.strict_std_compliance
+        && mtrx == Rav1dMatrixCoefficients::IDENTITY
+        && layout != Rav1dPixelLayout::I444
+    {
         return Err(EINVAL);
     }
     let separate_uv_delta_q;