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

update core

Browse Source
This commit is contained in:
ochibani 2025-01-04 16:07:14 +02:00
parent 44587f55fe
commit 626e056a82
No known key found for this signature in database
GPG Key ID: 2C6B61CE0C704ED4
6 changed files with 281 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -483,7 +483,6 @@ dependencies = [
"anyhow", "anyhow",
"async-std", "async-std",
"blue-recorder-core", "blue-recorder-core",
"chrono",
"cpal", "cpal",
"dark-light", "dark-light",
"dirs", "dirs",
@ -503,6 +502,7 @@ name = "blue-recorder-core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono",
"ffmpeg-sidecar", "ffmpeg-sidecar",
"glib 0.10.3", "glib 0.10.3",
"libadwaita", "libadwaita",

3
core/Cargo.toml
View File

@ -5,11 +5,12 @@ edition = "2021"
[features] [features]
cmd = [] cmd = []
gtk = ["dep:adw", "dep:glib", "dep:subprocess"] gtk = ["adw", "chrono", "glib", "subprocess"]
[dependencies] [dependencies]
adw = { version = "0.2.1", package = "libadwaita", features = ["gtk_v4_6"], optional = true } adw = { version = "0.2.1", package = "libadwaita", features = ["gtk_v4_6"], optional = true }
anyhow = "1.0.86" anyhow = "1.0.86"
chrono = { version = "0.4.19", optional = true }
ffmpeg-sidecar = "1.1.0" ffmpeg-sidecar = "1.1.0"
glib = { version = "0.10.3", optional = true } glib = { version = "0.10.3", optional = true }
open = "5.1.4" open = "5.1.4"

110
core/src/ffmpeg_linux.rs
View File

@ -1,9 +1,12 @@
use adw::gtk::{CheckButton, ComboBoxText, Entry, FileChooserNative, SpinButton};
use adw::gtk::prelude::*;
use anyhow::{anyhow, Error, Result}; use anyhow::{anyhow, Error, Result};
use chrono::Utc;
use ffmpeg_sidecar::child::FfmpegChild; use ffmpeg_sidecar::child::FfmpegChild;
use ffmpeg_sidecar::command::FfmpegCommand; use ffmpeg_sidecar::command::FfmpegCommand;
use tempfile; use tempfile;
use std::{cell::RefCell, time::Instant}; use std::{cell::RefCell, time::Instant};
use std::path::Path; use std::path::{Path, PathBuf};
use std::rc::Rc; use std::rc::Rc;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
@ -36,24 +39,25 @@ pub struct Ffmpeg {
#[cfg(feature = "gtk")] #[cfg(feature = "gtk")]
#[derive(Clone)] #[derive(Clone)]
pub struct Ffmpeg { pub struct Ffmpeg {
pub audio_input_id: String, pub audio_input_id: ComboBoxText,
pub audio_output_id: String, pub audio_output_id: String,
pub filename: String, pub filename: (FileChooserNative, Entry, ComboBoxText),
pub output: String, pub output: String,
pub temp_input_audio_filename: String, pub temp_input_audio_filename: String,
pub temp_output_audio_filename: String, pub temp_output_audio_filename: String,
pub temp_video_filename: String, pub temp_video_filename: String,
pub saved_filename: String,
pub height: Option<u16>, pub height: Option<u16>,
pub input_audio_process: Option<Rc<RefCell<FfmpegChild>>>, pub input_audio_process: Option<Rc<RefCell<FfmpegChild>>>,
pub output_audio_process: Option<Rc<RefCell<FfmpegChild>>>, pub output_audio_process: Option<Rc<RefCell<FfmpegChild>>>,
pub video_process: Option<Rc<RefCell<FfmpegChild>>>, pub video_process: Option<Rc<RefCell<FfmpegChild>>>,
pub audio_record_bitrate: u16, pub audio_record_bitrate: SpinButton,
pub record_delay: u16, pub record_delay: SpinButton,
pub record_frames: u16, pub record_frames: SpinButton,
pub video_record_bitrate: u16, pub video_record_bitrate: SpinButton,
pub follow_mouse: bool, pub follow_mouse: CheckButton,
pub record_mouse: bool, pub record_mouse: CheckButton,
pub show_area: bool, pub show_area: CheckButton,
} }
#[cfg(feature = "cmd")] #[cfg(feature = "cmd")]
@ -423,6 +427,30 @@ impl Ffmpeg {
#[cfg(feature = "gtk")] #[cfg(feature = "gtk")]
impl Ffmpeg { impl Ffmpeg {
// Get file name
pub fn get_filename(&mut self) -> Result<String> {
self.saved_filename =
self.filename
.0
.file()
.ok_or_else(|| anyhow!("Unable to get GFile."))?
.path()
.ok_or_else(|| anyhow!("Failed to get path from GFile."))?
.join(PathBuf::from(format!(
"{}.{}",
if self.filename.1.text().to_string().trim().eq("") {
Utc::now().to_string().replace(" UTC", "").replace(' ', "-")
} else {
self.filename.1.text().to_string().trim().to_string()
},
self.filename.2.active_id().ok_or_else(|| anyhow!("Failed to get active_id column."))?
)))
.as_path()
.display()
.to_string();
Ok(self.saved_filename.clone())
}
// Start video recording // Start video recording
pub fn start_video(&mut self, x: u16, y: u16, width: u16, height: u16, mode: RecordMode) -> Result<()> { pub fn start_video(&mut self, x: u16, y: u16, width: u16, height: u16, mode: RecordMode) -> Result<()> {
let display = format!("{}+{},{}", let display = format!("{}+{},{}",
@ -434,9 +462,14 @@ impl Ffmpeg {
let mut ffmpeg_command = FfmpegCommand::new(); let mut ffmpeg_command = FfmpegCommand::new();
let format = "x11grab"; let format = "x11grab";
self.height = Some(height); self.height = Some(height);
let filename = self.saved_filename.clone();
self.output = Path::new(&filename).extension()
.ok_or_else(|| anyhow!("Failed to get file extension."))?
.to_string_lossy().to_string();
// Record video to tmp if audio record enabled // Record video to tmp if audio record enabled
if !self.audio_input_id.is_empty() if !self.audio_input_id.active_id().ok_or_else(|| anyhow!("Failed to get audio input device ID."))?
.to_string().is_empty()
|| !self.audio_output_id.is_empty() || !self.audio_output_id.is_empty()
|| self.output == "gif" || self.output == "gif"
{ {
@ -454,7 +487,7 @@ impl Ffmpeg {
} }
// Record video with specified width and hight // Record video with specified width and hight
if self.follow_mouse { if self.follow_mouse.is_active() {
match mode { match mode {
RecordMode::Screen => { RecordMode::Screen => {
let width = width as f32 * 0.95; let width = width as f32 * 0.95;
@ -470,25 +503,25 @@ impl Ffmpeg {
} }
// Show grabbed area // Show grabbed area
if self.show_area { if self.show_area.is_active() {
ffmpeg_command.args(["-show_region", "1"]); ffmpeg_command.args(["-show_region", "1"]);
} }
// If show mouse switch is enabled, draw the mouse to video // If show mouse switch is enabled, draw the mouse to video
if self.record_mouse { if self.record_mouse.is_active() {
ffmpeg_command.args(["-draw_mouse", "1"]); ffmpeg_command.args(["-draw_mouse", "1"]);
} else { } else {
ffmpeg_command.args(["-draw_mouse", "0"]); ffmpeg_command.args(["-draw_mouse", "0"]);
}; };
// Follow the mouse // Follow the mouse
if self.follow_mouse { if self.follow_mouse.is_active() {
ffmpeg_command.args(["-follow_mouse", "centered"]); ffmpeg_command.args(["-follow_mouse", "centered"]);
} }
// Disable frame rate if value is zero // Disable frame rate if value is zero
if self.record_frames > 0 { if self.record_frames.value() as u16 > 0 {
ffmpeg_command.args(["-framerate", &self.record_frames.to_string()]); ffmpeg_command.args(["-framerate", &self.record_frames.value().to_string()]);
} }
// Video format && input // Video format && input
@ -496,15 +529,16 @@ impl Ffmpeg {
.input(display); .input(display);
// Disable bitrate if value is zero // Disable bitrate if value is zero
if self.video_record_bitrate > 0 { if self.video_record_bitrate.value() as u16 > 0 {
ffmpeg_command.args([ ffmpeg_command.args([
"-b:v", "-b:v",
&format!("{}K", self.video_record_bitrate), &format!("{}K", self.video_record_bitrate.value() as u16),
]); ]);
} }
// tmp file // tmp file
if self.audio_input_id.is_empty() && if self.audio_input_id.active_id().ok_or_else(|| anyhow!("Failed to get audio input device ID."))?
.to_string().is_empty() &&
self.audio_output_id.is_empty() && self.audio_output_id.is_empty() &&
self.output != "gif" self.output != "gif"
{ {
@ -515,22 +549,25 @@ impl Ffmpeg {
ffmpeg_command.args(["-map_metadata", "-1"]); ffmpeg_command.args(["-map_metadata", "-1"]);
// Output // Output
let saved_filename = self.saved_filename.clone();
ffmpeg_command.args([ ffmpeg_command.args([
{ {
if !self.audio_input_id.is_empty() if !self.audio_input_id.active_id()
.ok_or_else(|| anyhow!("Failed to get active audio input device ID."))?
.to_string().is_empty()
|| !self.audio_output_id.is_empty() || !self.audio_output_id.is_empty()
|| self.output == "gif" || self.output == "gif"
{ {
&self.temp_video_filename &self.temp_video_filename
} else { } else {
&self.filename &saved_filename
} }
}, },
]); ]);
ffmpeg_command.overwrite(); ffmpeg_command.overwrite();
// Sleep for delay // Sleep for delay
sleep(Duration::from_secs(self.record_delay 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(Rc::new(RefCell::new(ffmpeg_command.spawn()?))); self.video_process = Some(Rc::new(RefCell::new(ffmpeg_command.spawn()?)));
@ -561,13 +598,15 @@ impl Ffmpeg {
.to_string(); .to_string();
let mut ffmpeg_command = FfmpegCommand::new(); let mut ffmpeg_command = FfmpegCommand::new();
ffmpeg_command.format("pulse") ffmpeg_command.format("pulse")
.input(&self.audio_input_id) .input(&self.audio_input_id.active_id()
.ok_or_else(|| anyhow!("Failed to get audio input ID."))?
)
.format("ogg"); .format("ogg");
// Disable bitrate if value is zero // Disable bitrate if value is zero
if self.audio_record_bitrate > 0 { if self.audio_record_bitrate.value() as u16 > 0 {
ffmpeg_command.args([ ffmpeg_command.args([
"-b:a", "-b:a",
&format!("{}K", self.audio_record_bitrate), &format!("{}K", self.audio_record_bitrate.value() as u16),
]); ]);
} }
// Remove metadate // Remove metadate
@ -577,7 +616,7 @@ impl Ffmpeg {
// Sleep for delay // Sleep for delay
if !is_video_record(&self.temp_video_filename) { if !is_video_record(&self.temp_video_filename) {
sleep(Duration::from_secs(self.record_delay 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
@ -617,7 +656,7 @@ impl Ffmpeg {
// Sleep for delay // Sleep for delay
if !is_video_record(&self.temp_video_filename) && !is_input_audio_record(&self.temp_input_audio_filename) { if !is_video_record(&self.temp_video_filename) && !is_input_audio_record(&self.temp_input_audio_filename) {
sleep(Duration::from_secs(self.record_delay 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
@ -664,7 +703,7 @@ impl Ffmpeg {
ffmpeg_command.args([ ffmpeg_command.args([
"-c:a", "-c:a",
"aac", "aac",
&self.filename, &self.saved_filename.clone()
]); ]);
ffmpeg_command.overwrite() ffmpeg_command.overwrite()
.spawn()? .spawn()?
@ -682,10 +721,13 @@ impl Ffmpeg {
} }
// Convert MP4 to GIF // Convert MP4 to GIF
let filter = format!("fps={},scale={}:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse", let filter = format!("fps={},scale={}:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse",
self.record_frames,self.height.ok_or_else self.record_frames.value() as u16,
self.height.ok_or_else
(|| anyhow!("Unable to get height value"))?); (|| anyhow!("Unable to get height value"))?);
let ffmpeg_convert = format!("ffmpeg -i file:{} -filter_complex '{}' \ let ffmpeg_convert = format!("ffmpeg -i file:{} -filter_complex '{}' \
-loop 0 {} -y", &self.temp_video_filename,filter,&self.filename); -loop 0 {} -y", &self.temp_video_filename,filter,
&self.saved_filename
.clone());
std::process::Command::new("sh").arg("-c").arg(&ffmpeg_convert).output()?; std::process::Command::new("sh").arg("-c").arg(&ffmpeg_convert).output()?;
} }
} else if is_input_audio_record(&self.temp_input_audio_filename) { } else if is_input_audio_record(&self.temp_input_audio_filename) {
@ -709,7 +751,8 @@ impl Ffmpeg {
ffmpeg_command.args([ ffmpeg_command.args([
"-c:a", "-c:a",
"aac", "aac",
&self.filename, &self.saved_filename
.clone()
]).overwrite() ]).overwrite()
.spawn()? .spawn()?
.wait()?; .wait()?;
@ -728,7 +771,8 @@ impl Ffmpeg {
let mut ffmpeg_command = FfmpegCommand::new(); let mut ffmpeg_command = FfmpegCommand::new();
ffmpeg_command.format("ogg"); ffmpeg_command.format("ogg");
ffmpeg_command.input(&self.temp_output_audio_filename); ffmpeg_command.input(&self.temp_output_audio_filename);
ffmpeg_command.arg(&self.filename) ffmpeg_command.arg(&self.saved_filename
.clone())
.overwrite() .overwrite()
.spawn()? .spawn()?
.wait()?; .wait()?;

98
core/src/ffmpeg_windows.rs
View File

@ -1,9 +1,12 @@
use adw::gtk::{CheckButton, ComboBoxText, Entry, FileChooserNative, SpinButton};
use adw::gtk::prelude::*;
use anyhow::{anyhow, Error, Result}; use anyhow::{anyhow, Error, Result};
use chrono::Utc;
use ffmpeg_sidecar::child::FfmpegChild; use ffmpeg_sidecar::child::FfmpegChild;
use ffmpeg_sidecar::command::FfmpegCommand; use ffmpeg_sidecar::command::FfmpegCommand;
use tempfile; use tempfile;
use std::{cell::RefCell, time::Instant}; use std::{cell::RefCell, time::Instant};
use std::path::Path; use std::path::{Path, PathBuf};
use std::rc::Rc; use std::rc::Rc;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
@ -37,25 +40,26 @@ pub struct Ffmpeg {
#[cfg(feature = "gtk")] #[cfg(feature = "gtk")]
#[derive(Clone)] #[derive(Clone)]
pub struct Ffmpeg { pub struct Ffmpeg {
pub audio_input_id: String, pub audio_input_id: ComboBoxText,
pub audio_output_id: String, pub audio_output_id: String,
pub filename: String, pub filename: (FileChooserNative, Entry, ComboBoxText),
pub output: String, pub output: String,
pub temp_input_audio_filename: String, pub temp_input_audio_filename: String,
pub temp_output_audio_filename: String, pub temp_output_audio_filename: String,
pub temp_video_filename: String, pub temp_video_filename: String,
pub window_title: String, pub window_title: String,
pub saved_filename: String,
pub height: Option<u16>, pub height: Option<u16>,
pub input_audio_process: Option<Rc<RefCell<FfmpegChild>>>, pub input_audio_process: Option<Rc<RefCell<FfmpegChild>>>,
pub output_audio_process: Option<Rc<RefCell<FfmpegChild>>>, pub output_audio_process: Option<Rc<RefCell<FfmpegChild>>>,
pub video_process: Option<Rc<RefCell<FfmpegChild>>>, pub video_process: Option<Rc<RefCell<FfmpegChild>>>,
pub audio_record_bitrate: u16, pub audio_record_bitrate: SpinButton,
pub record_delay: u16, pub record_delay: SpinButton,
pub record_frames: u16, pub record_frames: SpinButton,
pub video_record_bitrate: u16, pub video_record_bitrate: SpinButton,
pub follow_mouse: bool, pub follow_mouse: CheckButton,
pub record_mouse: bool, pub record_mouse: CheckButton,
pub show_area: bool, pub show_area: CheckButton,
} }
#[cfg(feature = "cmd")] #[cfg(feature = "cmd")]
@ -414,6 +418,30 @@ impl Ffmpeg {
#[cfg(feature = "gtk")] #[cfg(feature = "gtk")]
impl Ffmpeg { impl Ffmpeg {
// Get file name
pub fn get_filename(&mut self) -> Result<String> {
self.saved_filename =
self.filename
.0
.file()
.ok_or_else(|| anyhow!("Unable to get GFile."))?
.path()
.ok_or_else(|| anyhow!("Failed to get path from GFile."))?
.join(PathBuf::from(format!(
"{}.{}",
if self.filename.1.text().to_string().trim().eq("") {
Utc::now().to_string().replace(" UTC", "").replace(' ', "-")
} else {
self.filename.1.text().to_string().trim().to_string()
},
self.filename.2.active_id().ok_or_else(|| anyhow!("Failed to get active_id column."))?
)))
.as_path()
.display()
.to_string();
Ok(self.saved_filename.clone())
}
// Start video recording // Start video recording
pub fn start_video(&mut self, x: u16, y: u16, width: u16, height: u16, mode: RecordMode) -> Result<()> { pub fn start_video(&mut self, x: u16, y: u16, width: u16, height: u16, mode: RecordMode) -> Result<()> {
let display = match mode { let display = match mode {
@ -425,7 +453,8 @@ impl Ffmpeg {
let format = "gdigrab"; let format = "gdigrab";
// Record video to tmp if audio record enabled // Record video to tmp if audio record enabled
if !self.audio_input_id.is_empty() if !self.audio_input_id.active_id().ok_or_else(|| anyhow!("Failed to get audio input device ID."))?
.to_string().is_empty()
|| !self.audio_output_id.is_empty() || !self.audio_output_id.is_empty()
|| self.output == "gif" || self.output == "gif"
{ {
@ -445,20 +474,20 @@ impl Ffmpeg {
ffmpeg_command.format(format); ffmpeg_command.format(format);
// Show grabbed area // Show grabbed area
if self.show_area { if self.show_area.is_active() {
ffmpeg_command.args(["-show_region", "1"]); ffmpeg_command.args(["-show_region", "1"]);
} }
// if show mouse switch is enabled, draw the mouse to video // if show mouse switch is enabled, draw the mouse to video
if self.record_mouse { if self.record_mouse.is_active() {
ffmpeg_command.args(["-draw_mouse", "1"]); ffmpeg_command.args(["-draw_mouse", "1"]);
} else { } else {
ffmpeg_command.args(["-draw_mouse", "0"]); ffmpeg_command.args(["-draw_mouse", "0"]);
}; };
// Disable frame rate if value is zero // Disable frame rate if value is zero
if self.record_frames > 0 { if self.record_frames.value() as u16 > 0 {
ffmpeg_command.args(["-framerate", &self.record_frames.to_string()]); ffmpeg_command.args(["-framerate", &self.record_frames.value().to_string()]);
} }
// Record video with specified width and hight // Record video with specified width and hight
@ -473,15 +502,16 @@ impl Ffmpeg {
ffmpeg_command.input(display); ffmpeg_command.input(display);
// Disable bitrate if value is zero // Disable bitrate if value is zero
if self.video_record_bitrate > 0 { if self.video_record_bitrate.value() as u16 > 0 {
ffmpeg_command.args([ ffmpeg_command.args([
"-b:v", "-b:v",
&format!("{}K", self.video_record_bitrate), &format!("{}K", self.video_record_bitrate.value().to_string()),
]); ]);
} }
// tmp file // tmp file
if self.audio_input_id.is_empty() && if self.audio_input_id.active_id().ok_or_else(|| anyhow!("Failed to get audio input device ID."))?
.to_string().is_empty() &&
self.audio_output_id.is_empty() && self.audio_output_id.is_empty() &&
self.output != "gif" self.output != "gif"
{ {
@ -492,22 +522,24 @@ impl Ffmpeg {
ffmpeg_command.args(["-map_metadata", "-1"]); ffmpeg_command.args(["-map_metadata", "-1"]);
// Output // Output
let saved_filename = self.saved_filename.clone();
ffmpeg_command.args([ ffmpeg_command.args([
{ {
if !self.audio_input_id.is_empty() if !self.audio_input_id.active_id().ok_or_else(|| anyhow!("Failed to get audio input device ID."))?
.to_string().is_empty()
|| !self.audio_output_id.is_empty() || !self.audio_output_id.is_empty()
|| self.output == "gif" || self.output == "gif"
{ {
&self.temp_video_filename &self.temp_video_filename
} else { } else {
&self.filename &saved_filename
} }
}, },
]); ]);
ffmpeg_command.overwrite(); ffmpeg_command.overwrite();
// Sleep for delay // Sleep for delay
sleep(Duration::from_secs(self.record_delay 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(Rc::new(RefCell::new(ffmpeg_command.spawn()?))); self.video_process = Some(Rc::new(RefCell::new(ffmpeg_command.spawn()?)));
@ -541,10 +573,10 @@ impl Ffmpeg {
.input(format!("audio={}", &self.audio_input_id)) .input(format!("audio={}", &self.audio_input_id))
.format("ogg"); .format("ogg");
// Disable bitrate if value is zero // Disable bitrate if value is zero
if self.audio_record_bitrate > 0 { if self.audio_record_bitrate.value() as u16 > 0 {
ffmpeg_command.args([ ffmpeg_command.args([
"-b:a", "-b:a",
&format!("{}K", self.audio_record_bitrate), &format!("{}K", self.audio_record_bitrate.value() as u16),
]); ]);
} }
// Remove metadate // Remove metadate
@ -554,7 +586,7 @@ impl Ffmpeg {
// Sleep for delay // Sleep for delay
if !is_video_record(&self.temp_video_filename) { if !is_video_record(&self.temp_video_filename) {
sleep(Duration::from_secs(self.record_delay 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
@ -594,7 +626,7 @@ impl Ffmpeg {
// Sleep for delay // Sleep for delay
if !is_video_record(&self.temp_video_filename) && !is_input_audio_record(&self.temp_input_audio_filename) { if !is_video_record(&self.temp_video_filename) && !is_input_audio_record(&self.temp_input_audio_filename) {
sleep(Duration::from_secs(self.record_delay 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
@ -641,7 +673,8 @@ impl Ffmpeg {
ffmpeg_command.args([ ffmpeg_command.args([
"-c:a", "-c:a",
"aac", "aac",
&self.filename, &self.saved_filename
.clone()
]); ]);
ffmpeg_command.overwrite() ffmpeg_command.overwrite()
.spawn()? .spawn()?
@ -659,10 +692,13 @@ impl Ffmpeg {
} }
// Convert MP4 to GIF // Convert MP4 to GIF
let filter = format!("fps={},scale={}:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse", let filter = format!("fps={},scale={}:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse",
self.record_frames,self.height.ok_or_else self.record_frames.value() as u16,
self.height.ok_or_else
(|| anyhow!("Unable to get height value"))?); (|| anyhow!("Unable to get height value"))?);
let ffmpeg_convert = format!("ffmpeg -i file:{} -filter_complex '{}' \ let ffmpeg_convert = format!("ffmpeg -i file:{} -filter_complex '{}' \
-loop 0 {} -y", &self.temp_video_filename,filter,&self.filename); -loop 0 {} -y", &self.temp_video_filename,filter,
&self.saved_filename
.clone());
std::process::Command::new("sh").arg("-c").arg(&ffmpeg_convert).output()?; std::process::Command::new("sh").arg("-c").arg(&ffmpeg_convert).output()?;
} }
} else if is_input_audio_record(&self.temp_input_audio_filename) { } else if is_input_audio_record(&self.temp_input_audio_filename) {
@ -686,7 +722,8 @@ impl Ffmpeg {
ffmpeg_command.args([ ffmpeg_command.args([
"-c:a", "-c:a",
"aac", "aac",
&self.filename, &self.saved_filename
.clone()
]).overwrite() ]).overwrite()
.spawn()? .spawn()?
.wait()?; .wait()?;
@ -705,7 +742,8 @@ impl Ffmpeg {
let mut ffmpeg_command = FfmpegCommand::new(); let mut ffmpeg_command = FfmpegCommand::new();
ffmpeg_command.format("ogg"); ffmpeg_command.format("ogg");
ffmpeg_command.input(&self.temp_output_audio_filename); ffmpeg_command.input(&self.temp_output_audio_filename);
ffmpeg_command.arg(&self.filename) ffmpeg_command.arg(&self.saved_filename
.clone())
.overwrite() .overwrite()
.spawn()? .spawn()?
.wait()?; .wait()?;

1
gui/Cargo.toml
View File

@ -7,7 +7,6 @@ edition = "2021"
anyhow = "1.0.86" anyhow = "1.0.86"
async-std = {version = "1.12.0", features = ["attributes"]} async-std = {version = "1.12.0", features = ["attributes"]}
blue-recorder-core = { path = "../core", features = ["gtk"] } blue-recorder-core = { path = "../core", features = ["gtk"] }
chrono = "0.4.19"
cpal = "0.15.3" cpal = "0.15.3"
dark-light = "1.0.0" dark-light = "1.0.0"
dirs = "4.0.0" dirs = "4.0.0"

96
gui/src/ui.rs
View File

@ -9,11 +9,10 @@ use blue_recorder_core::ffmpeg_linux::Ffmpeg;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
use blue_recorder_core::ffmpeg_windows::Ffmpeg; use blue_recorder_core::ffmpeg_windows::Ffmpeg;
use blue_recorder_core::utils::{is_wayland, play_record, RecordMode}; use blue_recorder_core::utils::{is_wayland, play_record, RecordMode};
use chrono::Utc;
use cpal::traits::{DeviceTrait, HostTrait}; use cpal::traits::{DeviceTrait, HostTrait};
use std::cell::RefCell; use std::cell::RefCell;
use std::ops::Add; use std::ops::Add;
use std::path::{Path, PathBuf}; use std::path::Path;
use std::rc::Rc; use std::rc::Rc;
use crate::{area_capture, config_management, fluent::get_bundle}; use crate::{area_capture, config_management, fluent::get_bundle};
@ -692,34 +691,11 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
}); });
// Record struct values // Record struct values
let audio_input_id = if audio_input_switch.is_active() {
audio_source_combobox.active_id().unwrap().to_string()
} else {
String::new()
};
let audio_output_id = if audio_output_switch.is_active() { let audio_output_id = if audio_output_switch.is_active() {
output_device output_device
} else { } else {
String::new() String::new()
}; };
let audio_record_bitrate = audio_bitrate_spin.value() as u16;
let filename = folder_chooser_native
.file()
.unwrap()
.path()
.unwrap()
.join(PathBuf::from(format!(
"{}.{}",
if filename_entry.text().to_string().trim().eq("") {
Utc::now().to_string().replace(" UTC", "").replace(' ', "-")
} else {
filename_entry.text().to_string().trim().to_string()
},
format_chooser_combobox.active_id().unwrap()
)))
.as_path()
.display().to_string();
let follow_mouse = follow_mouse_switch.is_active();
let mode = if area_grab_button.is_active() { let mode = if area_grab_button.is_active() {
RecordMode::Area RecordMode::Area
} else if window_grab_button.is_active() { } else if window_grab_button.is_active() {
@ -727,58 +703,62 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
} else { } else {
RecordMode::Screen RecordMode::Screen
}; };
let output = Path::new(&filename).extension().unwrap().to_string_lossy().to_string();
let record_delay = delay_spin.value() as u16;
let record_frames = frames_spin.value() as u16;
let record_mouse = mouse_switch.is_active();
let show_area = area_switch.is_active();
let video_record_bitrate = video_bitrate_spin.value() as u16;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let window_title = window_title.borrow_mut().title.clone(); let window_title = window_title.borrow_mut().title.clone();
// Init record struct // Init record struct
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let ffmpeg_record_interface: Rc<RefCell<Ffmpeg>> = Rc::new(RefCell::new(Ffmpeg { let ffmpeg_record_interface: Rc<RefCell<Ffmpeg>> = Rc::new(RefCell::new(Ffmpeg {
audio_input_id, audio_input_id: audio_source_combobox.clone(),
audio_output_id, audio_output_id,
filename, filename: (
output, folder_chooser_native,
filename_entry,
format_chooser_combobox,
),
output: String::new(),
temp_input_audio_filename: String::new(), temp_input_audio_filename: String::new(),
temp_output_audio_filename: String::new(), temp_output_audio_filename: String::new(),
temp_video_filename: String::new(), temp_video_filename: String::new(),
window_title, window_title,
saved_filename: String::new(),
height: None, height: None,
input_audio_process: None, input_audio_process: None,
output_audio_process: None, output_audio_process: None,
video_process: None, video_process: None,
audio_record_bitrate, audio_record_bitrate: audio_bitrate_spin,
record_delay, record_delay: delay_spin,
record_frames, record_frames: frames_spin,
video_record_bitrate, video_record_bitrate: video_bitrate_spin,
follow_mouse, follow_mouse: follow_mouse_switch,
record_mouse, record_mouse: mouse_switch,
show_area, show_area: area_switch
})); }));
#[cfg(any(target_os = "freebsd", target_os = "linux"))] #[cfg(any(target_os = "freebsd", target_os = "linux"))]
let ffmpeg_record_interface: Rc<RefCell<Ffmpeg>> = Rc::new(RefCell::new(Ffmpeg { let ffmpeg_record_interface: Rc<RefCell<Ffmpeg>> = Rc::new(RefCell::new(Ffmpeg {
audio_input_id, audio_input_id: audio_source_combobox.clone(),
audio_output_id, audio_output_id,
filename, filename: (
output, folder_chooser_native,
filename_entry,
format_chooser_combobox,
),
output: String::new(),
temp_input_audio_filename: String::new(), temp_input_audio_filename: String::new(),
temp_output_audio_filename: String::new(), temp_output_audio_filename: String::new(),
temp_video_filename: String::new(), temp_video_filename: String::new(),
saved_filename: String::new(),
height: None, height: None,
input_audio_process: None, input_audio_process: None,
output_audio_process: None, output_audio_process: None,
video_process: None, video_process: None,
audio_record_bitrate, audio_record_bitrate: audio_bitrate_spin,
record_delay, record_delay: delay_spin.clone(),
record_frames, record_frames: frames_spin,
video_record_bitrate, video_record_bitrate: video_bitrate_spin,
follow_mouse, follow_mouse: follow_mouse_switch,
record_mouse, record_mouse: mouse_switch,
show_area, show_area: area_switch
})); }));
// Record button // Record button
@ -804,6 +784,14 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
//let wayland_record = main_context.block_on(WaylandRecorder::new()); //let wayland_record = main_context.block_on(WaylandRecorder::new());
let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone();
record_button.connect_clicked(move |_| { record_button.connect_clicked(move |_| {
match _ffmpeg_record_interface.borrow_mut().get_filename() {
Err(error) => {
let text_buffer = TextBuffer::new(None);
text_buffer.set_text(&format!("{}", error));
_error_message.set_buffer(Some(&text_buffer));
_error_dialog.show();
},
Ok(_) => {
if !_audio_input_switch.is_active() && if !_audio_input_switch.is_active() &&
!_audio_output_switch.is_active() && !_audio_output_switch.is_active() &&
!_video_switch.is_active() !_video_switch.is_active()
@ -896,6 +884,8 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
} }
} }
} }
},
}
}); });
// Stop record button // Stop record button
@ -971,7 +961,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
_video_switch.set_sensitive(true); _video_switch.set_sensitive(true);
record_button.show(); record_button.show();
_stop_button.hide(); _stop_button.hide();
let file_name = _ffmpeg_record_interface.borrow_mut().filename.clone(); let file_name = _ffmpeg_record_interface.borrow_mut().saved_filename.clone();
if Path::new(&file_name).try_exists().is_ok() { if Path::new(&file_name).try_exists().is_ok() {
_play_button.show(); _play_button.show();
_play_button.set_tooltip_text(Some(&get_bundle("play-tooltip", None))); _play_button.set_tooltip_text(Some(&get_bundle("play-tooltip", None)));
@ -991,7 +981,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
let _error_message = error_message.clone(); let _error_message = error_message.clone();
let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone();
play_button.connect_clicked(move |_| { play_button.connect_clicked(move |_| {
let file_name = _ffmpeg_record_interface.borrow_mut().filename.clone(); let file_name = _ffmpeg_record_interface.borrow_mut().saved_filename.clone();
match play_record(&file_name) { match play_record(&file_name) {
Ok(_) => { Ok(_) => {
// Do nothing // Do nothing