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

update merge

Browse Source
This commit is contained in:
ochibani 2025-01-18 21:34:23 +02:00
parent 84d4dc4b7e
commit 58f516c40a
No known key found for this signature in database
GPG Key ID: 2C6B61CE0C704ED4
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/src/ffmpeg_linux.rs
View File

@ -296,23 +296,28 @@ impl Ffmpeg {
return Err(Error::msg("Unable to validate tmp video file.")); return Err(Error::msg("Unable to validate tmp video file."));
} }
} }
let mut ffmpeg_command = FfmpegCommand::new(); if is_input_audio_record(&self.temp_input_audio_filename) ||
ffmpeg_command.input(&self.temp_video_filename); is_output_audio_record(&self.temp_output_audio_filename) {
ffmpeg_command.format("ogg"); let mut ffmpeg_command = FfmpegCommand::new();
if is_input_audio_record(&self.temp_input_audio_filename) { ffmpeg_command.input(&self.temp_video_filename);
ffmpeg_command.input(&self.temp_input_audio_filename); ffmpeg_command.format("ogg");
} if is_input_audio_record(&self.temp_input_audio_filename) {
if is_output_audio_record(&self.temp_output_audio_filename) { ffmpeg_command.input(&self.temp_input_audio_filename);
ffmpeg_command.input(&self.temp_output_audio_filename); }
} if is_output_audio_record(&self.temp_output_audio_filename) {
ffmpeg_command.args([ ffmpeg_command.input(&self.temp_output_audio_filename);
"-c:a", }
"aac", ffmpeg_command.args([
&self.filename, "-c:a",
]); "aac",
ffmpeg_command.overwrite() &self.saved_filename.clone()
.spawn()? ]);
.wait()?; ffmpeg_command.overwrite()
.spawn()?
.wait()?;
} else {
std::fs::copy(&self.temp_video_filename, &self.saved_filename)?;
}
} else { } else {
// Validate video file integrity // Validate video file integrity
let start_time = Instant::now(); let start_time = Instant::now();

39
core/src/ffmpeg_windows.rs
View File

@ -284,23 +284,28 @@ impl Ffmpeg {
return Err(Error::msg("Unable to validate tmp video file.")); return Err(Error::msg("Unable to validate tmp video file."));
} }
} }
let mut ffmpeg_command = FfmpegCommand::new(); if is_input_audio_record(&self.temp_input_audio_filename) ||
ffmpeg_command.input(&self.temp_video_filename); is_output_audio_record(&self.temp_output_audio_filename) {
ffmpeg_command.format("ogg"); let mut ffmpeg_command = FfmpegCommand::new();
if is_input_audio_record(&self.temp_input_audio_filename) { ffmpeg_command.input(&self.temp_video_filename);
ffmpeg_command.input(&self.temp_input_audio_filename); ffmpeg_command.format("ogg");
} if is_input_audio_record(&self.temp_input_audio_filename) {
if is_output_audio_record(&self.temp_output_audio_filename) { ffmpeg_command.input(&self.temp_input_audio_filename);
ffmpeg_command.input(&self.temp_output_audio_filename); }
} if is_output_audio_record(&self.temp_output_audio_filename) {
ffmpeg_command.args([ ffmpeg_command.input(&self.temp_output_audio_filename);
"-c:a", }
"aac", ffmpeg_command.args([
&self.filename, "-c:a",
]); "aac",
ffmpeg_command.overwrite() &self.saved_filename.clone()
.spawn()? ]);
.wait()?; ffmpeg_command.overwrite()
.spawn()?
.wait()?;
} else {
std::fs::copy(&self.temp_video_filename, &self.saved_filename)?;
}
} else { } else {
// Validate video file integrity // Validate video file integrity
let start_time = Instant::now(); let start_time = Instant::now();