From c117a8659508495ae6a39ef0cfdd23a321f3ee15 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 16 Apr 2026 20:38:41 +0200 Subject: [PATCH] use PaletteSearchMode from nihav_core --- src/palettise.rs | 14 +++----------- src/transcoder.rs | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/palettise.rs b/src/palettise.rs index 9889ee1..ead1b4e 100644 --- a/src/palettise.rs +++ b/src/palettise.rs @@ -2,7 +2,7 @@ use std::cmp::*; use std::convert::TryInto; use nihav_core::frame::*; -use nihav_core::scale::{NAScale, ScaleInfo, get_scale_fmt_from_pic}; +use nihav_core::scale::*; use nihav_codec_support::codecs::qt_pal::*; use nihav_codec_support::vq::*; @@ -194,14 +194,6 @@ impl KDTree { } } -#[derive(Clone,Copy,Debug,PartialEq,Default)] -pub enum PaletteSearchMode { - Full, - #[default] - Local, - Tree, -} - #[allow(clippy::large_enum_variant)] enum PMode { Full, @@ -220,7 +212,7 @@ impl Palettiser { let pmode = match mode { PaletteSearchMode::Full => PMode::Full, PaletteSearchMode::Local => PMode::Local(LocalSearch::new(pal)), - PaletteSearchMode::Tree => PMode::Tree(KDTree::new(pal)), + PaletteSearchMode::KDTree => PMode::Tree(KDTree::new(pal)), }; Self { pal: *pal, pmode } } @@ -333,7 +325,7 @@ pub fn create_palettiser(enc_opts: &[OptionArgs]) -> Option { pmode = match pmode_val.as_str() { "full" => Some(PaletteSearchMode::Full), "local" => Some(PaletteSearchMode::Local), - "tree" => Some(PaletteSearchMode::Tree), + "tree" => Some(PaletteSearchMode::KDTree), _ => { println!("invalid palettisation mode"); None diff --git a/src/transcoder.rs b/src/transcoder.rs index 371e419..12601db 100644 --- a/src/transcoder.rs +++ b/src/transcoder.rs @@ -977,7 +977,7 @@ impl Transcoder { if let Some(ref mut p) = plt { p.set_pal(gpal); } else { - plt = Some(Palettiser::new(crate::palettise::PaletteSearchMode::default(), gpal)); + plt = Some(Palettiser::new(PaletteSearchMode::default(), gpal)); } } } -- 2.39.5