diff --git a/include/dav1d/headers.rs b/include/dav1d/headers.rs index 4055b131d..3762a0d80 100644 --- a/include/dav1d/headers.rs +++ b/include/dav1d/headers.rs @@ -57,16 +57,6 @@ where } } -impl DRav1d, Vec> -where - R: Clone + Into, -{ - pub fn push(&mut self, value: R) { - self.rav1d.push(value.clone()); - self.dav1d.push(value.into()); - } -} - // Constants from Section 3. "Symbols and abbreviated terms" pub const DAV1D_MAX_CDEF_STRENGTHS: usize = 8; pub const DAV1D_MAX_OPERATING_POINTS: usize = 32; @@ -844,10 +834,11 @@ impl From for Dav1dITUTT35 { impl Rav1dITUTT35 { pub fn to_immut( - mutable: Arc, Vec>>>, + mutable: Arc>>, ) -> Arc, Box<[Dav1dITUTT35]>>> { - let DRav1d { rav1d, dav1d: _ } = Arc::into_inner(mutable).unwrap().into_inner().unwrap(); - let rav1d = rav1d.into_boxed_slice(); + let mutable = Arc::into_inner(mutable).unwrap().into_inner().unwrap(); + let immutable = mutable.into_boxed_slice(); + let rav1d = immutable; let dav1d = rav1d.iter().cloned().map(Dav1dITUTT35::from).collect(); Arc::new(DRav1d { rav1d, dav1d }) } diff --git a/src/internal.rs b/src/internal.rs index 812ff41ad..bc9d05b24 100644 --- a/src/internal.rs +++ b/src/internal.rs @@ -12,7 +12,6 @@ use crate::include::dav1d::dav1d::Rav1dEventFlags; use crate::include::dav1d::dav1d::Rav1dInloopFilterType; use crate::include::dav1d::headers::DRav1d; use crate::include::dav1d::headers::Dav1dFrameHeader; -use crate::include::dav1d::headers::Dav1dITUTT35; use crate::include::dav1d::headers::Dav1dSequenceHeader; use crate::include::dav1d::headers::Rav1dContentLightLevel; use crate::include::dav1d::headers::Rav1dFrameHeader; @@ -325,7 +324,7 @@ pub struct Rav1dContext { pub(crate) frame_hdr: Option>>, // TODO(kkysen) Previously pooled. pub(crate) content_light: Option>, pub(crate) mastering_display: Option>, - pub(crate) itut_t35: Arc, Vec>>>, + pub(crate) itut_t35: Arc>>, // decoded output picture queue pub(crate) in_0: Rav1dData, diff --git a/src/picture.rs b/src/picture.rs index 3f92dff87..36d56007a 100644 --- a/src/picture.rs +++ b/src/picture.rs @@ -265,7 +265,7 @@ pub(crate) unsafe fn rav1d_thread_picture_alloc( c: &Rav1dContext, f: &mut Rav1dFrameData, bpc: c_int, - itut_t35: Arc, Vec>>>, + itut_t35: Arc>>, ) -> Rav1dResult { let p = &mut f.sr_cur; let have_frame_mt = c.n_fc > 1;