xlmnxp/blue-recorder
1
0
Fork 0
mirror of https://github.com/xlmnxp/blue-recorder.git synced 2025-04-03 08:14:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the implementation of Ffmpeg

Browse Source
This commit is contained in:
Salem Yaslem 2023-02-23 22:31:51 +03:00
parent a8f025ec2a
commit d82d71b1e7
1 changed files with 44 additions and 89 deletions

133
src/ffmpeg_interface.rs
View File

@ -5,7 +5,7 @@ use gtk::prelude::*;
use gtk::{ButtonsType, DialogFlags, MessageDialog, MessageType}; use gtk::{ButtonsType, DialogFlags, MessageDialog, MessageType};
use gtk::{CheckButton, ComboBoxText, Entry, FileChooserNative, ProgressBar, SpinButton, Window}; use gtk::{CheckButton, ComboBoxText, Entry, FileChooserNative, ProgressBar, SpinButton, Window};
use std::path::PathBuf; use std::path::PathBuf;
use std::process::{Command, Child}; use std::process::{Child, Command};
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
@ -53,7 +53,7 @@ pub struct Ffmpeg {
pub record_delay: SpinButton, pub record_delay: SpinButton,
pub command: Entry, pub command: Entry,
// TODO: fix Clone derive for process childs // TODO: fix Clone derive for process
pub video_process: Option<Child>, pub video_process: Option<Child>,
pub audio_process: Option<Child>, pub audio_process: Option<Child>,
pub saved_filename: Option<String>, pub saved_filename: Option<String>,
@ -140,21 +140,14 @@ impl Ffmpeg {
let mut ffmpeg_command: Command = Command::new("ffmpeg"); let mut ffmpeg_command: Command = Command::new("ffmpeg");
// record video with specified width and hight // record video with specified width and hight
ffmpeg_command.arg("-video_size"); ffmpeg_command.args(["-video_size", format!("{}x{}", width, height).as_str(), "-framerate", self.record_frames.value().to_string().as_str(), "-f", "x11grab", "-i", format!(
ffmpeg_command.arg(format!("{}x{}", width, height));
ffmpeg_command.arg("-framerate");
ffmpeg_command.arg(format!("{}", self.record_frames.value()));
ffmpeg_command.arg("-f");
ffmpeg_command.arg("x11grab");
ffmpeg_command.arg("-i");
ffmpeg_command.arg(format!(
"{}+{},{}", "{}+{},{}",
std::env::var("DISPLAY") std::env::var("DISPLAY")
.unwrap_or_else(|_| ":0".to_string()) .unwrap_or_else(|_| ":0".to_string())
.as_str(), .as_str(),
x, x,
y y
)); ).as_str()]);
// if show mouse switch is enabled, draw the mouse to video // if show mouse switch is enabled, draw the mouse to video
ffmpeg_command.arg("-draw_mouse"); ffmpeg_command.arg("-draw_mouse");
@ -166,18 +159,20 @@ impl Ffmpeg {
// if follow mouse switch is enabled, follow the mouse // if follow mouse switch is enabled, follow the mouse
if self.follow_mouse.is_active() { if self.follow_mouse.is_active() {
ffmpeg_command.arg("-follow_mouse"); ffmpeg_command.args(["-follow_mouse", "centered"]);
ffmpeg_command.arg("centered");
} }
ffmpeg_command.arg("-crf");
ffmpeg_command.arg("1"); ffmpeg_command.args(["-crf", "1", self.saved_filename.as_ref().unwrap(), "-y"]);
ffmpeg_command.arg(self.saved_filename.as_ref().unwrap());
ffmpeg_command.arg("-y");
// sleep for delay // sleep for delay
sleep(Duration::from_secs(self.record_delay.value() as u64)); sleep(Duration::from_secs(self.record_delay.value() as u64));
// start recording and return the process id // start recording and return the process id
self.video_process = Some(ffmpeg_command.spawn().unwrap()); self.video_process = Some(ffmpeg_command.spawn().unwrap());
return (Some(self.video_process.unwrap().id()), Some(self.audio_process.unwrap().id())); return (
Some(self.video_process.unwrap().id()),
Some(self.audio_process.unwrap().id()),
);
} }
(None, None) (None, None)
@ -202,41 +197,27 @@ impl Ffmpeg {
self.audio_process.unwrap().kill().unwrap(); self.audio_process.unwrap().kill().unwrap();
} }
let is_video_record = std::path::Path::new( let video_filename = format!(
format!( "{}.temp.without.audio.{}",
"{}{}", self.saved_filename.as_ref().unwrap(),
self.saved_filename.as_ref().unwrap_or(&String::from("")), self.filename.2.active_id().unwrap()
{ "" } );
)
.as_str(), let audio_filename = format!("{}.temp.audio", self.saved_filename.as_ref().unwrap());
)
.exists(); let is_video_record = std::path::Path::new(video_filename.as_str()).exists();
let is_audio_record = std::path::Path::new( let is_audio_record = std::path::Path::new(audio_filename.as_str()).exists();
format!(
"{}.temp.audio",
self.saved_filename.as_ref().unwrap_or(&String::from(""))
)
.as_str(),
)
.exists();
if is_video_record { if is_video_record {
let mut move_command = Command::new("mv"); let mut move_command = Command::new("mv");
move_command.arg(format!("{}{}", self.saved_filename.as_ref().unwrap(), { move_command.args([
"" self.saved_filename.as_ref().unwrap().as_str(),
}));
move_command.arg(format!(
"{}{}",
self.saved_filename.as_ref().unwrap_or(&String::new()),
if is_audio_record { if is_audio_record {
format!( video_filename.as_str()
".temp.without.audio.{}",
self.filename.2.active_id().unwrap()
)
} else { } else {
"".to_string() self.saved_filename.unwrap().as_str()
} },
)); ]);
move_command.output().unwrap(); move_command.output().unwrap();
self.progress_widget.set_progress("".to_string(), 4, 6); self.progress_widget.set_progress("".to_string(), 4, 6);
@ -246,16 +227,7 @@ impl Ffmpeg {
self.progress_widget self.progress_widget
.set_progress("Save Audio Recording".to_string(), 4, 6); .set_progress("Save Audio Recording".to_string(), 4, 6);
let video_filename = format!( Command::new("ffmpeg")
"{}.temp.without.audio.{}",
self.saved_filename.as_ref().unwrap(),
self.filename.2.active_id().unwrap()
);
let audio_filename =
format!("{}.temp.audio", self.saved_filename.as_ref().unwrap());
let output = Command::new("ffmpeg")
.args([ .args([
"-i", "-i",
video_filename.as_str(), video_filename.as_str(),
@ -269,46 +241,29 @@ impl Ffmpeg {
"-y", "-y",
]) ])
.output() .output()
.expect("failed to execute ffmpeg"); .expect("failed to merge video with audio");
println!("stat!: {:?}", output.status); std::fs::remove_file(video_filename).unwrap();
println!("out!: {:?}", String::from_utf8(output.stdout)); std::fs::remove_file(audio_filename).unwrap();
println!("err!: {:?}", String::from_utf8(output.stderr));
// std::fs::remove_file(format!(
// "{}.temp.audio",
// self.saved_filename.as_ref().unwrap()
// ))
// .unwrap();
// std::fs::remove_file(format!(
// "{}.temp.without.audio.{}",
// self.saved_filename.as_ref().unwrap(),
// self.filename.2.active_id().unwrap()
// ))
// .unwrap();
} }
} }
// if only audio is recording then convert it to chosen format // if only audio is recording then convert it to chosen format
else if is_audio_record { else if is_audio_record {
self.progress_widget self.progress_widget
.set_progress("Convert Audio to choosen format".to_string(), 4, 6); .set_progress("Convert Audio to choosen format".to_string(), 4, 6);
sleep(Duration::from_secs(1));
Command::new("ffmpeg") Command::new("ffmpeg")
.arg("-f") .args([
.arg("ogg") "-f",
.arg("-i") "ogg",
.arg(format!( "-i",
"{}.temp.audio", audio_filename.as_str(),
self.saved_filename.as_ref().unwrap() self.saved_filename.as_ref().unwrap(),
)) ])
.arg(self.saved_filename.as_ref().unwrap())
.output() .output()
.unwrap(); .expect("failed convert audio to video");
std::fs::remove_file(format!(
"{}.temp.audio", std::fs::remove_file(audio_filename).unwrap();
self.saved_filename.as_ref().unwrap()
))
.unwrap();
} }
self.progress_widget.set_progress("".to_string(), 5, 6); self.progress_widget.set_progress("".to_string(), 5, 6);