use PaletteSearchMode from nihav_core

diff --git a/src/palettise.rs b/src/palettise.rs
index 9889ee16b09680af62321186c4ad5a0b3d105fa7..ead1b4ee654de251042f4ea2da8832fbd9cfedf4 100644 (file)
--- 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<Palettiser> {
                     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 371e4191a9527ac9a8c0c82ea78d46e720747cb2..12601db3b3852188d8e32db9bef1527ebc8a70e3 100644 (file)
--- 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));
                 }
             }
         }