From 52ee632ae5804840bdd59f75d1c427fa5dd2550e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 6 May 2025 14:15:30 +0200 Subject: fix frame rect copy --- mtree-test/src/bin/decode.rs | 1 - mtree-test/src/bin/encode.rs | 3 +-- mtree-test/src/lib.rs | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'mtree-test/src') diff --git a/mtree-test/src/bin/decode.rs b/mtree-test/src/bin/decode.rs index 0fc8ba4..992bebc 100644 --- a/mtree-test/src/bin/decode.rs +++ b/mtree-test/src/bin/decode.rs @@ -61,7 +61,6 @@ impl BitstreamFilter for Dec { self.last.frames.push_back(frame.clone()); - eprintln!("out frame"); frame.0 } } diff --git a/mtree-test/src/bin/encode.rs b/mtree-test/src/bin/encode.rs index 3cdb1c8..f9b1b74 100644 --- a/mtree-test/src/bin/encode.rs +++ b/mtree-test/src/bin/encode.rs @@ -31,7 +31,6 @@ impl BitstreamFilter for Enc { } fn process_block(&mut self, frame: Vec) -> Vec { let mut frame = Frame(frame); - let mut out = Vec::new(); let mut num_refs = 0; @@ -51,7 +50,7 @@ impl BitstreamFilter for Enc { boff, ) }; - if rdist < 1000 { + if rdist < (BLOCK_SIZE * BLOCK_SIZE * 20) as u32 { out.push(1); out.extend(r.frame.to_le_bytes()); out.extend(r.off.x.to_le_bytes()); diff --git a/mtree-test/src/lib.rs b/mtree-test/src/lib.rs index cf55e92..bf0117d 100644 --- a/mtree-test/src/lib.rs +++ b/mtree-test/src/lib.rs @@ -82,7 +82,7 @@ pub fn frame_to_frame_rect_copy( aoff: I16Vec2, boff: I16Vec2, ) { - for y in size.x..size.y { + for y in 0..size.y { let astart = aframe.index(res, i16vec2(aoff.x, aoff.y + y)); let aend = aframe.index(res, i16vec2(aoff.x + size.x, aoff.y + y)); let bstart = bframe.index(res, i16vec2(boff.x, boff.y + y)); -- cgit v1.2.3-70-g09d2