Skip to content

Commit

Permalink
Reuse me stats for lookahead
Browse files Browse the repository at this point in the history
This partially addresses the comments in xiph#2934 by removing the
unnecessary field `coded_data.lookahead_me_stats`. This data is never
modified between the time it is created in
`compute_lookahead_motion_vectors` and the time it is used in
`compute_block_importances`, so there is no need to keep a separate copy
of it. Instead, we can use the main copy of the data in
`fs.frame_me_stats`.

Results in ~1% peak memory usage reduction.
  • Loading branch information
shssoichiro committed Jun 2, 2022
1 parent f4c2124 commit fbd76b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
12 changes: 2 additions & 10 deletions src/api/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -726,9 +726,6 @@ impl<T: Pixel> ContextInner<T> {

let coded_data = fi.coded_frame_data.as_mut().unwrap();

// Save the motion vectors to FrameInvariants.
coded_data.lookahead_me_stats = Some(fs.frame_me_stats.clone());

#[cfg(feature = "dump_lookahead_data")]
{
use crate::partition::RefType::*;
Expand Down Expand Up @@ -1088,6 +1085,7 @@ impl<T: Pixel> ContextInner<T> {
let output_frame_data =
self.frame_data.remove(&output_frameno).unwrap().unwrap();
let fi = &output_frame_data.fi;
let fs = &output_frame_data.fs;

let frame = self.frame_q[&fi.input_frameno].as_ref().unwrap();

Expand All @@ -1104,13 +1102,7 @@ impl<T: Pixel> ContextInner<T> {
let frame_data = &mut self.frame_data;
let len = unique_indices.len();

let lookahead_me_stats = fi
.coded_frame_data
.as_ref()
.unwrap()
.lookahead_me_stats
.as_ref()
.expect("Lookahead ME stats not populated, this is a bug");
let lookahead_me_stats = &fs.frame_me_stats;

// Compute and propagate the importance, split evenly between the
// referenced frames.
Expand Down
7 changes: 0 additions & 7 deletions src/encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -648,12 +648,6 @@ pub struct FrameInvariants<T: Pixel> {
/// This may change in the future.
#[derive(Debug, Clone)]
pub struct CodedFrameData<T: Pixel> {
/// Motion vectors to the _original_ reference frames (not reconstructed).
/// Used for lookahead purposes.
///
/// These objects are very expensive to create, so their creation
/// is deferred until it is needed.
pub lookahead_me_stats: Option<Arc<[FrameMEStats; REF_FRAMES as usize]>>,
/// The lookahead version of `rec_buffer`, used for storing and propagating
/// the original reference frames (rather than reconstructed ones). The
/// lookahead uses both `rec_buffer` and `lookahead_rec_buffer`, where
Expand Down Expand Up @@ -689,7 +683,6 @@ impl<T: Pixel> CodedFrameData<T> {
let h_in_imp_b = fi.h_in_b / 2;

CodedFrameData {
lookahead_me_stats: None,
lookahead_rec_buffer: ReferenceFramesSet::new(),
w_in_imp_b,
h_in_imp_b,
Expand Down

0 comments on commit fbd76b8

Please sign in to comment.