Skip to content

Commit

Permalink
struct Rav1dContext::refmvs_pool: Remove (for now) now-unused `refm…
Browse files Browse the repository at this point in the history
…vs_pool` now that `mvs`s have been `Arc`ified.
  • Loading branch information
kkysen committed Apr 19, 2024
1 parent 0c4a6bc commit 376352f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion src/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ pub struct Rav1dContext {
pub(crate) task_thread: Arc<TaskThreadData>,

// reference/entropy state
pub(crate) refmvs_pool: *mut Rav1dMemPool,
pub(crate) refs: [Rav1dContext_refs; 8],
pub(crate) cdf_pool: *mut Rav1dMemPool,
pub(crate) cdf: [CdfThreadContext; 8],
Expand Down
5 changes: 1 addition & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,7 @@ 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).refmvs_pool).is_err()
|| rav1d_mem_pool_init(&mut (*c).cdf_pool).is_err()
{
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
Expand Down Expand Up @@ -858,7 +856,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.refmvs_pool);
rav1d_mem_pool_end(self.cdf_pool);
rav1d_mem_pool_end(self.picture_pool);
}
Expand Down

0 comments on commit 376352f

Please sign in to comment.