Cleanup 10.3.23 (#71)

* Change crf lookup table

* Checkbox for showing the features

* Try updating bevy dependencies

* Fixes for updated bevy dependencies

* UI fixes for auto mode

* Documentation, cleanup, and update deprecated calls

* Update crate versions

Author: ac-freeman

.idea/runConfigurations/Check_stable.xml

@@ -1,6 +1,6 @@
 [package]
 name = "adder-codec-core"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 authors = ["Andrew C. Freeman"]
 description = """Core library for encoding/decoding ADΔER events

.idea/runConfigurations/Run_adder_viz_dynamic.xml

@@ -242,4 +242,8 @@ pub enum CodecError {
     #[cfg(feature = "compression")]
     #[error("Arithmetic coding error")]
     ArithmeticCodingError(#[from] arithmetic_coding::Error),
+
+    /// Vision application error
+    #[error("Vision application error")]
+    VisionError(String),
 }

adder-codec-core/Cargo.toml

@@ -72,7 +72,7 @@ pub enum TimeMode {
 }
 
 /// The size of the image plane in pixels
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct PlaneSize {
     width: u16,
     height: u16,
@@ -181,7 +181,7 @@ pub const D_ZERO_INTEGRATION: D = 254;
 /// Special symbol signifying no [`Event`] exists
 // pub const D_NO_EVENT: D = 253;
 
-#[derive(Clone, Copy, PartialEq, Default)]
+#[derive(Clone, Copy, PartialEq, Default, Debug)]
 pub enum Mode {
     /// Preserve temporal coherence for framed inputs. When an event fires, the ticks
     /// remaining for that input frame (and its associated intensity) are discarded. The

adder-codec-core/src/codec/mod.rs

@@ -1,6 +1,6 @@
 [package]
 name = "adder-codec-rs"
-version = "0.3.3"
+version = "0.3.4"
 edition = "2021"
 authors = ["Andrew C. Freeman"]
 description = """Encoder/transcoder/decoder for ADΔER (Address, Decimation, Δt Event Representation) streams.
@@ -27,7 +27,7 @@ docs-only = ["opencv", "dep:fast-math", "adder-codec-core"]
 
 
 [dependencies]
-adder-codec-core = { path = "../adder-codec-core", version = "0.2.0", default-features = false, optional = true}
+adder-codec-core = { path = "../adder-codec-core", version = "0.2.1", default-features = false, optional = true}
 async-trait = "0.1.66"
 bincode = "1.3.3"
 bitvec = "1.0.1"

adder-codec-core/src/lib.rs

@@ -6,7 +6,7 @@ use adder_codec_rs::framer::scale_intensity::event_to_intensity;
 use adder_codec_rs::transcoder::source::video::show_display_force;
 use bitstream_io::{BigEndian, BitReader};
 use clap::Parser;
-use ndarray::{Array, Array3};
+use ndarray::Array;
 use opencv::core::{create_continuous, Mat, MatTraitManual, CV_64F, CV_64FC3};
 use std::cmp::max;
 use std::error::Error;

adder-codec-rs/Cargo.toml

@@ -134,6 +134,7 @@ impl FramerBuilder {
         FrameSequence::<T>::new(self)
     }
 
+    /// Set whether to detect features.
     pub fn detect_features(mut self, detect_features: bool) -> FramerBuilder {
         self.detect_features = detect_features;
         self
@@ -231,7 +232,7 @@ pub struct FrameSequence<T> {
     /// The state of the frame sequence
     pub state: FrameSequenceState,
     pub(crate) frames: Vec<VecDeque<Frame<Option<T>>>>,
-    pub frame_idx_offsets: Vec<i64>,
+    pub(crate) frame_idx_offsets: Vec<i64>,
     pub(crate) pixel_ts_tracker: Vec<Array3<BigT>>,
     pub(crate) last_filled_tracker: Vec<Array3<i64>>,
     pub(crate) last_frame_intensity_tracker: Vec<Array3<T>>,
@@ -618,10 +619,12 @@ impl<T: Clone + Default + FrameValue<Output = T> + Serialize> FrameSequence<T> {
         true
     }
 
+    /// Get the instantaneous intensity for each pixel
     pub fn get_running_intensities(&self) -> &Array3<i32> {
         &self.running_intensities
     }
 
+    /// Get the features detected for the next frame, and pop that off the feature vec
     pub fn pop_features(&mut self) -> Option<Vec<Coord>> {
         self.features.push_back(vec![]);
         self.features.pop_front()

adder-codec-rs/src/bin/adder_video_player.rs

@@ -446,7 +446,9 @@ impl<W: Write + 'static> Integration<W> {
             for (e1, e2) in events.iter().tuple_windows() {
                 video.encoder.ingest_event(*e1)?;
                 if e2.delta_t != e1.delta_t {
-                    video.feature_test(e1);
+                    if let Err(e) = video.feature_test(e1) {
+                        return Err(CodecError::VisionError(e.to_string()));
+                    }
                 }
             }
         }
@@ -568,9 +570,6 @@ impl<W: Write + 'static> Integration<W> {
         for events in &big_buffer {
             for (e1, e2) in events.iter().tuple_windows() {
                 video.encoder.ingest_event(*e1)?;
-                if e2.delta_t != e1.delta_t {
-                    video.feature_test(e1);
-                }
             }
         }
 
@@ -873,6 +872,10 @@ impl<W: Write + 'static + std::marker::Send> Source<W> for Davis<W> {
         ret
     }
 
+    fn crf(&mut self, crf: u8) {
+        self.video.update_crf(crf, true);
+    }
+
     fn get_video_mut(&mut self) -> &mut Video<W> {
         &mut self.video
     }
@@ -894,7 +897,7 @@ impl<W: Write + 'static> VideoBuilder<W> for Davis<W> {
     }
 
     fn crf(mut self, crf: u8) -> Self {
-        self.video.update_crf(crf);
+        self.video.update_crf(crf, false);
         self
     }
 
@@ -963,8 +966,8 @@ impl<W: Write + 'static> VideoBuilder<W> for Davis<W> {
         self
     }
 
-    fn detect_features(mut self, detect_features: bool) -> Self {
-        self.video = self.video.detect_features(detect_features);
+    fn detect_features(mut self, detect_features: bool, show_features: bool) -> Self {
+        self.video = self.video.detect_features(detect_features, show_features);
         self
     }
 }

adder-codec-rs/src/framer/driver.rs

@@ -170,6 +170,10 @@ impl<W: Write + 'static> Source<W> for Framed<W> {
         })
     }
 
+    fn crf(&mut self, crf: u8) {
+        self.video.update_crf(crf, true);
+    }
+
     fn get_video_mut(&mut self) -> &mut Video<W> {
         &mut self.video
     }
@@ -191,7 +195,7 @@ impl<W: Write + 'static> VideoBuilder<W> for Framed<W> {
     }
 
     fn crf(mut self, crf: u8) -> Self {
-        self.video.update_crf(crf);
+        self.video.update_crf(crf, true);
         self
     }
 
@@ -263,8 +267,8 @@ impl<W: Write + 'static> VideoBuilder<W> for Framed<W> {
         self
     }
 
-    fn detect_features(mut self, detect_features: bool) -> Self {
-        self.video = self.video.detect_features(detect_features);
+    fn detect_features(mut self, detect_features: bool, show_features: bool) -> Self {
+        self.video = self.video.detect_features(detect_features, show_features);
         self
     }
 }