ASCEE/lasprs
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-implemented simpleclip, debugged

Browse Source
This commit is contained in:
Anne de Jong 2024-11-02 00:22:07 +01:00
parent f58c6f8839
commit 36de394a2e
1 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/rt/simpleclip.rs
View File

@ -5,7 +5,7 @@ use crate::math::max;
use crate::math::maxabs;
use crate::math::min;
use crate::Flt;
use crossbeam::channel::bounded;
use crossbeam::channel::unbounded;
use parking_lot::Mutex;
use std::sync::atomic::Ordering::Relaxed;
use std::{
@ -15,7 +15,7 @@ use std::{
/// If signal is below / above the range times the value below, we indicate that
/// the signal has clipped.
const CLIP_REL_LIMIT: Flt = 0.999;
const CLIP_REL_LIMIT: Flt = 0.99;
/// Very simple clip detector. Used to detect cliping in a recording. Stores one
/// clip value if just something happened between time of new and moment of drop().
@ -32,7 +32,7 @@ impl SimpleClipDetector {
///
/// - `smgr` - see [StreamMgr]
pub fn new(smgr: &mut StreamMgr) -> Self {
let (tx, rx) = bounded(0);
let (tx, rx) = unbounded();
let clipstate = Arc::new(AtomicBool::new(false));
let stopThread = Arc::new(AtomicBool::new(false));
@ -41,58 +41,62 @@ impl SimpleClipDetector {
let stopThread2 = stopThread.clone();
smgr.addInQueue(tx);
rayon::spawn(move || loop {
let mut streammeta: Option<Arc<StreamMetaData>> = None;
if let Ok(msg) = rx.recv_timeout(Duration::from_millis(1500)) {
match msg {
InStreamMsg::InStreamData(dat) => {
let meta = streammeta
.expect("If we are here, stream metadata should be available");
let flt = dat.getFloatData();
let maxs = flt
.columns()
.into_iter()
.map(|col| max(col))
.collect::<Vec<_>>();
let mins = flt
.columns()
.into_iter()
.map(|col| min(col))
.collect::<Vec<_>>();
rayon::spawn(
move || {
let mut streammeta: Option<Arc<StreamMetaData>> = None;
loop {
if let Ok(msg) = rx.recv_timeout(Duration::from_millis(1500)) {
match msg {
InStreamMsg::StreamStarted(meta) => {
streammeta = Some(meta);
}
InStreamMsg::InStreamData(dat) => {
let meta = streammeta
.as_ref()
.expect("If we are here, stream metadata should be available");
let flt = dat.getFloatData();
let maxs = flt
.columns()
.into_iter()
.map(|col| max(col))
.collect::<Vec<_>>();
let mins = flt
.columns()
.into_iter()
.map(|col| min(col))
.collect::<Vec<_>>();
let mut clip = false;
maxs.into_iter().zip(mins).zip(&meta.channelInfo).for_each(
|((max, min), ch)| {
let min_for_clip = CLIP_REL_LIMIT * ch.range.0;
let max_for_clip = CLIP_REL_LIMIT * ch.range.1;
if max >= max_for_clip {
clip = true;
}
if min <= min_for_clip {
clip = true;
}
},
);
if clip {
clipstate.store(true, Relaxed);
// We do not have to do anything anymore. The signal
// has clipped so we do not have to check any new
// blocks anymore.
return;
}
maxs.into_iter().zip(mins).zip(&meta.channelInfo).for_each(
|((max, min), ch)| {
let min_for_clip = CLIP_REL_LIMIT * ch.range.0;
let max_for_clip = CLIP_REL_LIMIT * ch.range.1;
if max >= max_for_clip {
clipstate.store(true, Relaxed);
// We do not have to do anything anymore. The signal
// has clipped so we do not have to check any new
// blocks anymore.
return;
}
if min <= min_for_clip {
clipstate.store(true, Relaxed);
// We do not have to do anything anymore. The signal
// has clipped so we do not have to check any new
// blocks anymore.
return;
}
},
);
}
// Ignore other stream messages
_ => {}
} // end match msg
}; // end if let Ok(msg)
if stopThread.load(Relaxed) {
return;
}
InStreamMsg::StreamStarted(meta) => {
streammeta = Some(meta);
}
_ => {}
}
};
if stopThread.load(Relaxed) {
return;
}
});
} // end of loop
}, // End of rayon closure
);
Self {
clipped: clipstate2,