djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup, logging

Browse Source
This commit is contained in:
jb-alvarado 2022-03-11 18:09:52 +01:00
parent 47808f9bf7
commit 756992e55e
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/filter/mod.rs
View File

@ -1,5 +1,7 @@
use std::path::Path; use std::path::Path;
use simplelog::*;
use crate::utils::{is_close, Config, Media}; use crate::utils::{is_close, Config, Media};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -34,7 +36,8 @@ impl Filters {
if filter.contains("aevalsrc") || filter.contains("anoisesrc") { if filter.contains("aevalsrc") || filter.contains("anoisesrc") {
self.audio_chain = Some(filter); self.audio_chain = Some(filter);
} else { } else {
self.audio_chain = Some(format!("[{}]{filter}", self.audio_map.clone().unwrap())); self.audio_chain =
Some(format!("[{}]{filter}", self.audio_map.clone().unwrap()));
} }
self.audio_map = Some("[aout1]".to_string()); self.audio_map = Some("[aout1]".to_string());
} }
@ -64,7 +67,7 @@ fn deinterlace(field_order: Option<String>, chain: &mut Filters) {
} }
fn pad(aspect: f64, chain: &mut Filters, config: &Config) { fn pad(aspect: f64, chain: &mut Filters, config: &Config) {
if !is_close(aspect, config.processing.aspect, 0.03) { if !is_close(aspect, config.processing.aspect, 0.03) {
if aspect < config.processing.aspect { if aspect < config.processing.aspect {
chain.add_filter( chain.add_filter(
format!( format!(
@ -191,7 +194,7 @@ fn extend_video(node: &mut Media, chain: &mut Filters) {
fn add_audio(node: &mut Media, chain: &mut Filters) { fn add_audio(node: &mut Media, chain: &mut Filters) {
let audio_streams = node.probe.clone().unwrap().audio_streams.unwrap(); let audio_streams = node.probe.clone().unwrap().audio_streams.unwrap();
if audio_streams.len() == 0 { if audio_streams.len() == 0 {
println!("Clip: '{}' has no audio!", node.source); warn!("Clip: '{}' has no audio!", node.source);
let audio = format!( let audio = format!(
"aevalsrc=0:channel_layout=stereo:duration={}:sample_rate=48000", "aevalsrc=0:channel_layout=stereo:duration={}:sample_rate=48000",
node.out - node.seek node.out - node.seek
@ -265,7 +268,13 @@ pub fn filter_chains(node: &mut Media, config: &Config) -> Vec<String> {
deinterlace(v_stream.field_order.clone(), &mut filters); deinterlace(v_stream.field_order.clone(), &mut filters);
pad(aspect, &mut filters, &config); pad(aspect, &mut filters, &config);
fps(frame_per_sec, &mut filters, &config); fps(frame_per_sec, &mut filters, &config);
scale(v_stream.width.unwrap(), v_stream.height.unwrap(), aspect, &mut filters, &config); scale(
v_stream.width.unwrap(),
v_stream.height.unwrap(),
aspect,
&mut filters,
&config,
);
extend_video(node, &mut filters); extend_video(node, &mut filters);
add_audio(node, &mut filters); add_audio(node, &mut filters);
extend_audio(node, &mut filters); extend_audio(node, &mut filters);

2
src/output/mod.rs
View File

@ -161,8 +161,6 @@ pub fn play(config: Config) {
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
println!("!!!!!!!!!!!!!!end");
match enc_proc.kill() { match enc_proc.kill() {
Ok(_) => info!("Playout done..."), Ok(_) => info!("Playout done..."),
Err(e) => panic!("Encoder error: {:?}", e), Err(e) => panic!("Encoder error: {:?}", e),

4
src/utils/mod.rs
View File

@ -115,7 +115,7 @@ impl MediaProbe {
} }
_ => { _ => {
println!("No codec type found for stream: {:?}", &stream) error!("No codec type found for stream: {:?}", &stream)
} }
} }
} }
@ -135,7 +135,7 @@ impl MediaProbe {
} }
} }
Err(err) => { Err(err) => {
println!( error!(
"Can't read source '{}' with ffprobe, source is probably damaged! Error is: {:?}", "Can't read source '{}' with ffprobe, source is probably damaged! Error is: {:?}",
input, input,
err err