Clean up code
This commit is contained in:
parent
9a328a9ba2
commit
6650565c72
106
src/main.rs
106
src/main.rs
|
@ -4,11 +4,8 @@ extern crate serde_derive;
|
||||||
extern crate gst;
|
extern crate gst;
|
||||||
extern crate itertools;
|
extern crate itertools;
|
||||||
|
|
||||||
|
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::prelude::*;
|
use std::io::prelude::*;
|
||||||
use std::thread;
|
|
||||||
use std::time::Duration;
|
|
||||||
|
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
|
|
||||||
|
@ -46,16 +43,58 @@ fn read_config(path: &str) -> Config {
|
||||||
file.read_to_string(&mut config_toml)
|
file.read_to_string(&mut config_toml)
|
||||||
.unwrap_or_else(|err| panic!("Error while reading config: [{}]", err));
|
.unwrap_or_else(|err| panic!("Error while reading config: [{}]", err));
|
||||||
|
|
||||||
let config: Config =
|
let config: Config = toml::from_str(&config_toml).unwrap_or_else(|err| {
|
||||||
toml::from_str(&config_toml).unwrap_or_else(|err| {
|
panic!("Error while parsing config: [{}]", err)
|
||||||
panic!("Error while parsing config: [{}]",
|
});
|
||||||
err)
|
|
||||||
});
|
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fn handle_pipeline_events(bus : &mut gst::bus::Bus) -> bool {
|
||||||
|
let bus_receiver = bus.receiver();
|
||||||
|
while let Ok(msg) = bus_receiver.try_recv() {
|
||||||
|
match msg.parse() {
|
||||||
|
gst::Message::StateChangedParsed { ref old, ref new, .. } => {
|
||||||
|
println!("element `{}` changed from {:?} to {:?}",
|
||||||
|
msg.src_name(), old, new);
|
||||||
|
}
|
||||||
|
gst::Message::ErrorParsed {ref error, ref debug, .. } => {
|
||||||
|
println!("error msg from element `{}`: {}, {}. Quitting",
|
||||||
|
msg.src_name(), error.message(), debug);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
println!("msg of type `{}` from element `{}`",
|
||||||
|
msg.type_name(), msg.src_name());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_max_samples(appsink : &gst::appsink::AppSink) -> Result<(f32, f32), &str>{
|
||||||
|
match appsink.recv(){
|
||||||
|
Ok(gst::appsink::Message::NewSample(sample)) | Ok(gst::appsink::Message::NewPreroll(sample)) => {
|
||||||
|
if let Some(buffer) = sample.buffer() {
|
||||||
|
let (max0, max1) = buffer.map_read(|mapping| {
|
||||||
|
mapping.iter::<f32>().tuples().fold((0.0f32, 0.0f32), |(acc0, acc1), (sample0, sample1)| {
|
||||||
|
(acc0.max(sample0.abs()), acc1.max(sample1.abs()))
|
||||||
|
})
|
||||||
|
}).unwrap();
|
||||||
|
return Ok((max0, max1));
|
||||||
|
}
|
||||||
|
return Err("Unable to access samples");
|
||||||
|
}
|
||||||
|
Ok(gst::appsink::Message::Eos) => {
|
||||||
|
return Err("Got no sample when polling. EOS");
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
return Err("Error, exiting");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
gst::init();
|
gst::init();
|
||||||
|
@ -72,7 +111,6 @@ fn main() {
|
||||||
let mut pipeline = gst::Pipeline::new_from_str(&pipeline_str).unwrap();
|
let mut pipeline = gst::Pipeline::new_from_str(&pipeline_str).unwrap();
|
||||||
let mut mainloop = gst::MainLoop::new();
|
let mut mainloop = gst::MainLoop::new();
|
||||||
let mut bus = pipeline.bus().expect("Couldn't get bus from pipeline");
|
let mut bus = pipeline.bus().expect("Couldn't get bus from pipeline");
|
||||||
let bus_receiver = bus.receiver();
|
|
||||||
let appsink = pipeline
|
let appsink = pipeline
|
||||||
.get_by_name("appsink0")
|
.get_by_name("appsink0")
|
||||||
.expect("Couldn't get appsink from pipeline");
|
.expect("Couldn't get appsink from pipeline");
|
||||||
|
@ -83,54 +121,22 @@ fn main() {
|
||||||
|
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let mut exit = false;
|
|
||||||
while let Ok(msg) = bus_receiver.try_recv() {
|
if handle_pipeline_events(&mut bus) {
|
||||||
match msg.parse() {
|
|
||||||
gst::Message::StateChangedParsed { ref old, ref new, .. } => {
|
|
||||||
println!("element `{}` changed from {:?} to {:?}",
|
|
||||||
msg.src_name(),
|
|
||||||
old,
|
|
||||||
new);
|
|
||||||
}
|
|
||||||
gst::Message::ErrorParsed {ref error, ref debug, .. } => {
|
|
||||||
println!("error msg from element `{}`: {}, {}. Quitting",
|
|
||||||
msg.src_name(),
|
|
||||||
error.message(),
|
|
||||||
debug);
|
|
||||||
exit = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
println!("msg of type `{}` from element `{}`",
|
|
||||||
msg.type_name(),
|
|
||||||
msg.src_name());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if exit {
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
match appsink.recv(){
|
let result = get_max_samples(& appsink);
|
||||||
Ok(gst::appsink::Message::NewSample(sample)) | Ok(gst::appsink::Message::NewPreroll(sample)) => {
|
match result {
|
||||||
if let Some(buffer) = sample.buffer() {
|
Ok((max0, max1)) => {
|
||||||
let (max0, max1) = buffer.map_read(|mapping| {
|
println!("{} | {}", max0, max1);
|
||||||
mapping.iter::<f32>().tuples().fold((0.0f32, 0.0f32), |(acc0, acc1), (sample0, sample1)| {
|
|
||||||
(acc0.max(sample0.abs()), acc1.max(sample1.abs()))
|
|
||||||
})
|
|
||||||
}).unwrap();
|
|
||||||
println!("{} | {}", max0, max1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(gst::appsink::Message::Eos) => {
|
Err(msg) => {
|
||||||
println!("Got no sample when polling. EOS");
|
println!("Error occured: {}", msg);
|
||||||
break;
|
|
||||||
}
|
|
||||||
Err(_) => {
|
|
||||||
println!("Error, exiting");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue