header: Implement frame_size_with_refs()

Signed-off-by: James Almer <[email protected]>

Author: jamrial

src/encoder.rs

@@ -821,6 +821,14 @@ impl<T: Pixel> FrameInvariants<T> {
     fi.error_resilient =
       if fi.frame_type == FrameType::SWITCH { true } else { error_resilient };
 
+    // force frame_size_with_refs() code path if render size != frame size
+    if fi.frame_type == FrameType::INTER
+      && !fi.error_resilient
+      && fi.render_and_frame_size_different
+    {
+      fi.frame_size_override_flag = true;
+    }
+
     if fi.frame_type == FrameType::SWITCH {
       fi.frame_size_override_flag = true;
     } else if fi.sequence.reduced_still_picture_hdr {

src/header.rs

@@ -176,6 +176,9 @@ pub trait UncompressedHeader {
   fn write_render_size<T: Pixel>(
     &mut self, fi: &FrameInvariants<T>,
   ) -> io::Result<()>;
+  fn write_frame_size_with_refs<T: Pixel>(
+    &mut self, fi: &FrameInvariants<T>,
+  ) -> io::Result<()>;
   fn write_deblock_filter_a<T: Pixel>(
     &mut self, fi: &FrameInvariants<T>, deblock: &DeblockState,
   ) -> io::Result<()>;
@@ -629,7 +632,7 @@ impl<W: io::Write> UncompressedHeader for BitWriter<W, BigEndian> {
       }
 
       if !fi.error_resilient && fi.frame_size_override_flag {
-        unimplemented!();
+        self.write_frame_size_with_refs(fi)?;
       } else {
         self.write_frame_size(fi)?;
         self.write_render_size(fi)?;
@@ -897,6 +900,36 @@ impl<W: io::Write> UncompressedHeader for BitWriter<W, BigEndian> {
     Ok(())
   }
 
+  fn write_frame_size_with_refs<T: Pixel>(
+    &mut self, fi: &FrameInvariants<T>,
+  ) -> io::Result<()> {
+    let mut found_ref = false;
+    for i in 0..INTER_REFS_PER_FRAME {
+      if let Some(ref rec) = fi.rec_buffer.frames[fi.ref_frames[i] as usize] {
+        if rec.width == fi.width as u32
+          && rec.height == fi.height as u32
+          && rec.render_width == fi.render_width
+          && rec.render_height == fi.render_height
+        {
+          self.write_bit(true)?;
+          found_ref = true;
+          break;
+        } else {
+          self.write_bit(false)?;
+        }
+      } else {
+        self.write_bit(false)?;
+      }
+    }
+    if !found_ref {
+      self.write_frame_size(fi)?;
+      self.write_render_size(fi)?;
+    } else if fi.sequence.enable_superres {
+      unimplemented!();
+    }
+    Ok(())
+  }
+
   fn write_deblock_filter_a<T: Pixel>(
     &mut self, fi: &FrameInvariants<T>, deblock: &DeblockState,
   ) -> io::Result<()> {