Skip to content

Commit

Permalink
struct Rav1dContext::cdf_pool: Remove now-unused cdf_pool (#985)
Browse files Browse the repository at this point in the history
This was already `Arc`ified in a previous PR, so this removes the now
unused pool.
  • Loading branch information
kkysen authored Apr 19, 2024
2 parents d5c1619 + 990ff36 commit ebfe7ba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 1 addition & 2 deletions src/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ pub struct Rav1dContext {

// reference/entropy state
pub(crate) refs: [Rav1dContext_refs; 8],
pub(crate) cdf_pool: *mut Rav1dMemPool,
pub(crate) cdf: [CdfThreadContext; 8],
pub(crate) cdf: [CdfThreadContext; 8], // Previously pooled

pub(crate) dsp: [Rav1dDSPContext; 3], /* 8, 10, 12 bits/component */
pub(crate) refmvs_dsp: Rav1dRefmvsDSPContext,
Expand Down
4 changes: 0 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,6 @@ pub(crate) unsafe fn rav1d_open(c_out: &mut *mut Rav1dContext, s: &Rav1dSettings
(*c).inloop_filters = s.inloop_filters;
(*c).decode_frame_type = s.decode_frame_type;
(*c).cached_error_props = Default::default();
if rav1d_mem_pool_init(&mut (*c).cdf_pool).is_err() {
return error(c, c_out);
}
if (*c).allocator.alloc_picture_callback == dav1d_default_picture_alloc
&& (*c).allocator.release_picture_callback == dav1d_default_picture_release
{
Expand Down Expand Up @@ -856,7 +853,6 @@ impl Drop for Rav1dContext {
let _ = mem::take(&mut self.mastering_display);
let _ = mem::take(&mut self.content_light);
let _ = mem::take(&mut self.itut_t35);
rav1d_mem_pool_end(self.cdf_pool);
rav1d_mem_pool_end(self.picture_pool);
}
}
Expand Down

0 comments on commit ebfe7ba

Please sign in to comment.