X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fcinepakenc.rs;h=6905e423504a44c76e345d1f14b26a5ab32acde0;hb=94c520bf3df0c0e0b436d7c9a2e4b0b40550a453;hp=99194ceae268f82af995ce0d0d22a712794c525e;hpb=13704efd78d1055406fead7d801edada74c2ddf3;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/cinepakenc.rs b/nihav-commonfmt/src/codecs/cinepakenc.rs index 99194ce..6905e42 100644 --- a/nihav-commonfmt/src/codecs/cinepakenc.rs +++ b/nihav-commonfmt/src/codecs/cinepakenc.rs @@ -214,6 +214,7 @@ impl MaskWriter { #[derive(Clone,Copy,PartialEq)] enum QuantMode { ELBG, + Fast, MedianCut, } @@ -221,11 +222,19 @@ impl std::string::ToString for QuantMode { fn to_string(&self) -> String { match *self { QuantMode::ELBG => "elbg".to_string(), + QuantMode::Fast => "fast".to_string(), QuantMode::MedianCut => "mediancut".to_string(), } } } +#[derive(Clone,Copy,PartialEq)] +enum CodingMode { + Skip, + V1, + V4 +} + struct CinepakEncoder { stream: Option, lastfrm: Option>, @@ -234,6 +243,7 @@ struct CinepakEncoder { key_int: u8, qmode: QuantMode, quality: u8, + refine: bool, nstrips: usize, force_v1: bool, cur_strip: usize, @@ -251,12 +261,24 @@ struct CinepakEncoder { rng: RNG, masks: MaskWriter, skip_dist: Vec, + fst_bins: [Vec; 4], + v1_cand: Vec, + v4_cand: Vec, + cmode: Vec, } fn avg4(a: u8, b: u8, c: u8, d: u8) -> u8 { ((u16::from(a) + u16::from(b) + u16::from(c) + u16::from(d) + 3) >> 2) as u8 } +fn variance(a: u8, mean: u8) -> u32 { + if a >= mean { + u32::from(a - mean) * u32::from(a - mean) + } else { + u32::from(mean - a) * u32::from(mean - a) + } +} + fn patch_size(bw: &mut ByteWriter, pos: u64) -> EncoderResult<()> { let size = bw.tell() - pos; bw.seek(SeekFrom::Current(-((size + 3) as i64)))?; @@ -265,6 +287,51 @@ fn patch_size(bw: &mut ByteWriter, pos: u64) -> EncoderResult<()> { Ok(()) } +fn elbg_quant(entries: &[YUVCode], codebook: &mut [YUVCode]) -> usize { + let cb_len = quantise_median_cut::(entries, codebook); + if cb_len < codebook.len() { + cb_len + } else { + let mut elbg: ELBG = ELBG::new(codebook); + elbg.quantise(entries, codebook) + } +} + +fn quant_fast(bins: &mut [Vec; 4], entries: &[YUVCode], codebook: &mut [YUVCode]) -> usize { + for bin in bins.iter_mut() { + bin.clear(); + } + for &entry in entries.iter() { + let y_avg = avg4(entry.y[0], entry.y[1], entry.y[2], entry.y[3]); + let dist = entry.y.iter().fold(0u32, |acc, &x| acc + variance(x, y_avg)); + let ilog = if dist == 0 { 0 } else { 32 - dist.leading_zeros() }; + let bin = match ilog { + 0..=3 => &mut bins[0], + 4..=7 => &mut bins[1], + 8..=11 => &mut bins[2], + _ => &mut bins[3], + }; + bin.push(entry); + } + let mut free_cw = codebook.len(); + let mut entries_left = entries.len(); + let mut offset = 0; + for bin in bins.iter() { + if bin.is_empty() { + continue; + } + if free_cw == 0 || entries_left == 0 { + break; + } + let target = (free_cw * bin.len() + entries_left - 1) / entries_left; + let cur_len = elbg_quant(bin, &mut codebook[offset..][..target]); + offset += cur_len; + free_cw -= cur_len; + entries_left -= bin.len(); + } + offset +} + impl CinepakEncoder { fn new() -> Self { Self { @@ -272,9 +339,10 @@ impl CinepakEncoder { pkt: None, lastfrm: None, frmcount: 0, - qmode: QuantMode::MedianCut, + qmode: QuantMode::Fast, key_int: 25, quality: 0, + refine: false, nstrips: 2, force_v1: false, cur_strip: 0, @@ -292,6 +360,10 @@ impl CinepakEncoder { v4_idx: Vec::new(), masks: MaskWriter::new(), skip_dist: Vec::new(), + fst_bins: [Vec::new(), Vec::new(), Vec::new(), Vec::new()], + v1_cand: Vec::new(), + v4_cand: Vec::new(), + cmode: Vec::new(), } } fn read_strip(&mut self, in_frm: &NAVideoBuffer, start: usize, end: usize) { @@ -604,23 +676,22 @@ impl CinepakEncoder { fn quant_vectors(&mut self) { match self.qmode { QuantMode::ELBG => { - let v1_len = quantise_median_cut::(&self.v1_entries, &mut self.v1_cur_cb[self.cur_strip]); - let v4_len = if !self.force_v1 { - quantise_median_cut::(&self.v4_entries, &mut self.v4_cur_cb[self.cur_strip]) + self.v1_len = elbg_quant(&self.v1_entries, &mut self.v1_cur_cb[self.cur_strip]); + self.v4_len = if !self.force_v1 { + elbg_quant(&self.v4_entries, &mut self.v4_cur_cb[self.cur_strip]) } else { 0 }; - self.v1_len = if v1_len < 256 { - v1_len - } else { - let mut elbg_v1: ELBG = ELBG::new(&self.v1_cur_cb[self.cur_strip]); - elbg_v1.quantise(&self.v1_entries, &mut self.v1_cur_cb[self.cur_strip]) - }; - self.v4_len = if v4_len < 256 { - v4_len + }, + QuantMode::Fast => { + for bin in self.fst_bins.iter_mut() { + bin.clear(); + } + self.v1_len = quant_fast(&mut self.fst_bins, &self.v1_entries, &mut self.v1_cur_cb[self.cur_strip]); + self.v4_len = if !self.force_v1 { + quant_fast(&mut self.fst_bins, &self.v4_entries, &mut self.v4_cur_cb[self.cur_strip]) } else { - let mut elbg_v4: ELBG = ELBG::new(&self.v4_cur_cb[self.cur_strip]); - elbg_v4.quantise(&self.v4_entries, &mut self.v4_cur_cb[self.cur_strip]) + 0 }; }, QuantMode::MedianCut => { @@ -636,6 +707,52 @@ impl CinepakEncoder { for e in self.v1_cur_cb[self.cur_strip].iter_mut().skip(self.v1_len) { *e = YUVCode::default(); } for e in self.v4_cur_cb[self.cur_strip].iter_mut().skip(self.v4_len) { *e = YUVCode::default(); } } + fn refine_vectors(&mut self) { + match self.qmode { + QuantMode::ELBG => { + self.v1_len = if !self.v1_cand.is_empty() { + elbg_quant(&self.v1_cand, &mut self.v1_cur_cb[self.cur_strip]) + } else { + 0 + }; + self.v4_len = if !self.force_v1 && !self.v4_cand.is_empty() { + elbg_quant(&self.v4_cand, &mut self.v4_cur_cb[self.cur_strip]) + } else { + 0 + }; + }, + QuantMode::Fast => { + for bin in self.fst_bins.iter_mut() { + bin.clear(); + } + self.v1_len = if !self.v1_cand.is_empty() { + quant_fast(&mut self.fst_bins, &self.v1_cand, &mut self.v1_cur_cb[self.cur_strip]) + } else { + 0 + }; + self.v4_len = if !self.force_v1 && !self.v4_cand.is_empty() { + quant_fast(&mut self.fst_bins, &self.v4_cand, &mut self.v4_cur_cb[self.cur_strip]) + } else { + 0 + }; + }, + QuantMode::MedianCut => { + self.v1_len = if !self.v1_cand.is_empty() { + quantise_median_cut::(&self.v1_cand, &mut self.v1_cur_cb[self.cur_strip]) + } else { + 0 + }; + if !self.force_v1 && !self.v4_cand.is_empty() { + self.v4_len = quantise_median_cut::(&self.v4_cand, &mut self.v4_cur_cb[self.cur_strip]); + } else { + self.v4_len = 0; + } + }, + }; + + for e in self.v1_cur_cb[self.cur_strip].iter_mut().skip(self.v1_len) { *e = YUVCode::default(); } + for e in self.v4_cur_cb[self.cur_strip].iter_mut().skip(self.v4_len) { *e = YUVCode::default(); } + } fn encode_intra(&mut self, bw: &mut ByteWriter, in_frm: &NAVideoBuffer) -> EncoderResult { let (width, height) = in_frm.get_dimensions(0); let mut strip_h = (height / self.nstrips + 3) & !3; @@ -683,11 +800,19 @@ impl CinepakEncoder { self.v4_idx.clear(); self.masks.reset(); + self.cmode.clear(); + self.v1_cand.clear(); + self.v4_cand.clear(); for (v1_entry, v4_entries) in self.v1_entries.iter().zip(self.v4_entries.chunks(4)) { let (v1_idx, v1_dist) = Self::find_nearest(&self.v1_cur_cb[self.cur_strip][..self.v1_len], *v1_entry); if v1_dist == 0 || self.force_v1 { - self.masks.put_v1(); - self.v1_idx.push(v1_idx); + if !self.refine { + self.masks.put_v1(); + self.v1_idx.push(v1_idx); + } else { + self.cmode.push(CodingMode::V1); + self.v1_cand.push(*v1_entry); + } continue; } let (v40_idx, v40_dist) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[0]); @@ -695,14 +820,53 @@ impl CinepakEncoder { let (v42_idx, v42_dist) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[2]); let (v43_idx, v43_dist) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[3]); if v40_dist + v41_dist + v42_dist + v43_dist > v1_dist { - self.masks.put_v4(); - self.v4_idx.push(v40_idx); - self.v4_idx.push(v41_idx); - self.v4_idx.push(v42_idx); - self.v4_idx.push(v43_idx); + if !self.refine { + self.masks.put_v4(); + self.v4_idx.push(v40_idx); + self.v4_idx.push(v41_idx); + self.v4_idx.push(v42_idx); + self.v4_idx.push(v43_idx); + } else { + self.cmode.push(CodingMode::V4); + self.v4_cand.extend_from_slice(v4_entries); + } } else { - self.masks.put_v1(); - self.v1_idx.push(v1_idx); + if !self.refine { + self.masks.put_v1(); + self.v1_idx.push(v1_idx); + } else { + self.cmode.push(CodingMode::V1); + self.v1_cand.push(*v1_entry); + } + } + } + if self.refine { + self.refine_vectors(); + let mut v1_src = self.v1_cand.iter(); + let mut v4_src = self.v4_cand.chunks_exact(4); + for &cmode in self.cmode.iter() { + match cmode { + CodingMode::Skip => unreachable!(), + CodingMode::V1 => { + let v1_entry = v1_src.next().unwrap(); + let (v1_idx, _) = Self::find_nearest(&self.v1_cur_cb[self.cur_strip][..self.v1_len], *v1_entry); + self.masks.put_v1(); + self.v1_idx.push(v1_idx); + }, + CodingMode::V4 => { + let v4_entries = v4_src.next().unwrap(); + let (v40_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[0]); + let (v41_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[1]); + let (v42_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[2]); + let (v43_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[3]); + + self.masks.put_v4(); + self.v4_idx.push(v40_idx); + self.v4_idx.push(v41_idx); + self.v4_idx.push(v42_idx); + self.v4_idx.push(v43_idx); + }, + }; } } self.masks.end(); @@ -816,23 +980,40 @@ impl CinepakEncoder { self.v4_idx.clear(); self.masks.reset(); + self.cmode.clear(); + self.v1_cand.clear(); + self.v4_cand.clear(); + let mut skip_iter = self.skip_dist.iter(); for (v1_entry, v4_entries) in self.v1_entries.iter().zip(self.v4_entries.chunks(4)) { let skip_dist = *skip_iter.next().unwrap(); if skip_dist == 0 { - self.masks.put_inter(true); + if !self.refine { + self.masks.put_inter(true); + } else { + self.cmode.push(CodingMode::Skip); + } continue; } let (v1_idx, v1_dist) = Self::find_nearest(&self.v1_cur_cb[self.cur_strip][..self.v1_len], *v1_entry); if skip_dist < v1_dist { - self.masks.put_inter(true); + if !self.refine { + self.masks.put_inter(true); + } else { + self.cmode.push(CodingMode::Skip); + } continue; - } else { + } else if !self.refine { self.masks.put_inter(false); } if v1_dist == 0 || self.force_v1 { - self.masks.put_v1(); - self.v1_idx.push(v1_idx); + if !self.refine { + self.masks.put_v1(); + self.v1_idx.push(v1_idx); + } else { + self.cmode.push(CodingMode::V1); + self.v1_cand.push(*v1_entry); + } continue; } let (v40_idx, v40_dist) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[0]); @@ -840,14 +1021,57 @@ impl CinepakEncoder { let (v42_idx, v42_dist) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[2]); let (v43_idx, v43_dist) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[3]); if v40_dist + v41_dist + v42_dist + v43_dist > v1_dist { - self.masks.put_v4(); - self.v4_idx.push(v40_idx); - self.v4_idx.push(v41_idx); - self.v4_idx.push(v42_idx); - self.v4_idx.push(v43_idx); + if !self.refine { + self.masks.put_v4(); + self.v4_idx.push(v40_idx); + self.v4_idx.push(v41_idx); + self.v4_idx.push(v42_idx); + self.v4_idx.push(v43_idx); + } else { + self.cmode.push(CodingMode::V4); + self.v4_cand.extend_from_slice(v4_entries); + } } else { - self.masks.put_v1(); - self.v1_idx.push(v1_idx); + if !self.refine { + self.masks.put_v1(); + self.v1_idx.push(v1_idx); + } else { + self.cmode.push(CodingMode::V1); + self.v1_cand.push(*v1_entry); + } + } + } + if self.refine { + self.refine_vectors(); + let mut v1_src = self.v1_cand.iter(); + let mut v4_src = self.v4_cand.chunks_exact(4); + for &cmode in self.cmode.iter() { + match cmode { + CodingMode::Skip => { + self.masks.put_inter(true); + }, + CodingMode::V1 => { + let v1_entry = v1_src.next().unwrap(); + let (v1_idx, _) = Self::find_nearest(&self.v1_cur_cb[self.cur_strip][..self.v1_len], *v1_entry); + self.masks.put_inter(false); + self.masks.put_v1(); + self.v1_idx.push(v1_idx); + }, + CodingMode::V4 => { + let v4_entries = v4_src.next().unwrap(); + let (v40_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[0]); + let (v41_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[1]); + let (v42_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[2]); + let (v43_idx, _) = Self::find_nearest(&self.v4_cur_cb[self.cur_strip][..self.v4_len], v4_entries[3]); + + self.masks.put_inter(false); + self.masks.put_v4(); + self.v4_idx.push(v40_idx); + self.v4_idx.push(v41_idx); + self.v4_idx.push(v42_idx); + self.v4_idx.push(v43_idx); + }, + }; } } self.masks.end(); @@ -1041,10 +1265,13 @@ const ENCODER_OPTS: &[NAOptionDefinition] = &[ opt_type: NAOptionDefinitionType::Int(Some(0), Some(16)) }, NAOptionDefinition { name: "quant_mode", description: "Quantisation mode", - opt_type: NAOptionDefinitionType::String(Some(&["elbg", "mediancut"])) }, + opt_type: NAOptionDefinitionType::String(Some(&["elbg", "fast", "mediancut"])) }, NAOptionDefinition { name: "force_v1", description: "Force coarse (V1-only) mode", opt_type: NAOptionDefinitionType::Bool }, + NAOptionDefinition { + name: "refine", description: "Try to improve coded picture", + opt_type: NAOptionDefinitionType::Bool }, ]; impl NAOptionHandler for CinepakEncoder { @@ -1068,6 +1295,7 @@ impl NAOptionHandler for CinepakEncoder { if let NAValue::String(ref strval) = option.value { match strval.as_str() { "elbg" => self.qmode = QuantMode::ELBG, + "fast" => self.qmode = QuantMode::Fast, "mediancut" => self.qmode = QuantMode::MedianCut, _ => {}, }; @@ -1078,6 +1306,11 @@ impl NAOptionHandler for CinepakEncoder { self.force_v1 = val; } }, + "refine" => { + if let NAValue::Bool(val) = option.value { + self.refine = val; + } + }, _ => {}, }; } @@ -1090,6 +1323,7 @@ impl NAOptionHandler for CinepakEncoder { "nstrips" => Some(NAValue::Int(self.nstrips as i64)), "quant_mode" => Some(NAValue::String(self.qmode.to_string())), "force_v1" => Some(NAValue::Bool(self.force_v1)), + "refine" => Some(NAValue::Bool(self.refine)), _ => None, } } @@ -1147,8 +1381,11 @@ mod test { tb_den: 0, flags: 0, }; - //test_encoding_to_file(&dec_config, &enc_config, enc_params, &[]); - test_encoding_md5(&dec_config, &enc_config, enc_params, &[], + let enc_options = &[ + NAOption { name: "quant_mode", value: NAValue::String("mediancut".to_string()) }, + ]; + //test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options); + test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options, &[0x1d4690c8, 0x3b15b4b3, 0xc2df3c7b, 0x1a25b159]); } }