diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2023-02-08 17:36:49 +0100 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2023-02-08 17:36:49 +0100 |
| commit | 3c4707815eabbbb185639734bc7411747cb91066 (patch) | |
| tree | ecc28f1a5caeaa2e26dc03bcd92ab70815e700cc | |
| parent | b4c5fc31220b98d528ef593f29a45cbc587c860f (diff) | |
| download | nihav-3c4707815eabbbb185639734bc7411747cb91066.tar.gz | |
msvideo1enc: fix skip mode
| -rw-r--r-- | nihav-ms/src/codecs/msvideo1enc.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nihav-ms/src/codecs/msvideo1enc.rs b/nihav-ms/src/codecs/msvideo1enc.rs index af81f53..0733215 100644 --- a/nihav-ms/src/codecs/msvideo1enc.rs +++ b/nihav-ms/src/codecs/msvideo1enc.rs @@ -394,10 +394,8 @@ impl MSVideo1Encoder { if skip_dist <= skip_threshold { skip_run += 1; is_intra = false; - if skip_threshold > 0 { - for (dst, src) in dstrip[x..].chunks_mut(dstride).zip(rstrip[x..].chunks(rstride)).take(4) { - dst[..4].copy_from_slice(&src[..4]); - } + for (dst, src) in dstrip[x..].chunks_mut(dstride).zip(rstrip[x..].chunks(rstride)).take(4) { + dst[..4].copy_from_slice(&src[..4]); } if skip_run == 1023 { Self::write_skips(bw, skip_run)?; @@ -410,7 +408,7 @@ impl MSVideo1Encoder { bstate.calc_stats(&buf); let dst = &mut dstrip[x..]; - if skip_dist <= bstate.fill_dist { + if skip_dist <= bstate.fill_dist && skip_dist * 2 <= bstate.clr2_dist { skip_run += 1; is_intra = false; for (dst, src) in dst.chunks_mut(dstride).zip(rstrip[x..].chunks(rstride)).take(4) { @@ -669,6 +667,6 @@ mod test { }; //test_encoding_to_file(&dec_config, &enc_config, enc_params, &[]); test_encoding_md5(&dec_config, &enc_config, enc_params, &[], - &[0xdff8b20c, 0xd16b80fc, 0x5bb61187, 0xb4fe6065]); + &[0xe570a206, 0xc223063f, 0x44a0b70e, 0xa71fed1f]); } } |