Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/rustmotion-core/src/schema/scenario.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ pub struct FontEntry {
pub family: String,
}

#[derive(Debug, Serialize, Deserialize, JsonSchema)]
#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
pub struct AudioTrack {
pub src: String,
#[serde(default)]
Expand Down
1 change: 1 addition & 0 deletions crates/rustmotion/src/encode/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pub mod audio;
pub mod video;
pub mod video_audio;

pub use video::build_frame_tasks;
pub use video::encode_gif;
Expand Down
16 changes: 12 additions & 4 deletions crates/rustmotion/src/encode/video/ffmpeg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,26 @@ pub fn encode_with_ffmpeg(
return Err(RustmotionError::NoFrames);
}

// Process audio
// Process audio — merge scenario.audio with tracks extracted from embedded
// video components.
let total_duration = total_frames as f64 / fps as f64;
let audio_tmp_dir = if !scenario.audio.is_empty() {
let video_tracks = super::super::video_audio::collect_video_audio_tracks(scenario);
let merged_audio: Vec<crate::schema::AudioTrack> = {
let mut all = scenario.audio.clone();
all.extend(video_tracks);
all
};

let audio_tmp_dir = if !merged_audio.is_empty() {
Some(std::env::temp_dir().join(format!("rustmotion_audio_{}", std::process::id())))
} else {
None
};
let pcm_data = if !scenario.audio.is_empty() {
let pcm_data = if !merged_audio.is_empty() {
if let Some(ref tmp_dir) = audio_tmp_dir {
std::fs::create_dir_all(tmp_dir)?;
}
super::super::audio::mix_audio_tracks(&scenario.audio, total_duration)?
super::super::audio::mix_audio_tracks(&merged_audio, total_duration)?
} else {
None
};
Expand Down
12 changes: 10 additions & 2 deletions crates/rustmotion/src/encode/video/mux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@ pub(super) fn mux_h264_to_mp4(
scenario: &Scenario,
total_duration: f64,
) -> Result<()> {
let pcm_data = if !scenario.audio.is_empty() {
super::super::audio::mix_audio_tracks(&scenario.audio, total_duration)?
// Collect audio from embedded video components and merge with scenario.audio.
let video_tracks = super::super::video_audio::collect_video_audio_tracks(scenario);
let merged_audio: Vec<crate::schema::AudioTrack> = {
let mut all = scenario.audio.clone();
all.extend(video_tracks);
all
};

let pcm_data = if !merged_audio.is_empty() {
super::super::audio::mix_audio_tracks(&merged_audio, total_duration)?
} else {
None
};
Expand Down
Loading
Loading