Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

Merge remote-tracking branch 'origin/main' into perf/bounded-playback-audio-prerender

Richie McIlroyb91e37860b14
diff --cc crates/editor/src/audio.rs
index 0e44ef3c6,3204f8924..c8cb3b013
--- a/crates/editor/src/audio.rs
+++ b/crates/editor/src/audio.rs
@@@ -2467,9 -1865,38 +2487,38 @@@ impl<T: FromSampleBytes + cpal::FromSam
}
}
+ /// Whether the next `samples` reads are rendered; `None` once the
+ /// render can no longer produce them.
+ #[cfg(feature = "test-hooks")]
+ fn rendered(&self, samples: usize) -> Option<bool> {
+ let timeline = &self.timeline;
+ let start = self.read_position.min(timeline.samples.len());
+ let end = (self.read_position + samples).min(timeline.samples.len());
+ if start >= end || timeline.complete.load(Ordering::Acquire) {
+ return Some(true);
+ }
+ let primary_end = timeline.primary_end.load(Ordering::Acquire);
+ let wrap_end = timeline.wrap_end.load(Ordering::Acquire);
+ let primary = timeline.primary_start;
+ let covered = if start >= primary {
+ primary_end >= end
+ } else if end <= primary {
+ wrap_end >= end
+ } else {
+ wrap_end >= primary && primary_end >= end
+ };
+ if covered {
+ Some(true)
+ } else if timeline.stop.load(Ordering::Acquire) {
+ None
+ } else {
+ Some(false)
+ }
+ }
+
pub fn set_playhead(&mut self, playhead_secs: f64) {
let sample_position = (playhead_secs * self.sample_rate as f64) as usize * self.channels;
- self.read_position = sample_position.min(self.timeline.samples.len());
+ self.read_position = sample_position.min(self.render.timeline.samples.len());
}
pub fn current_audible_playhead(&self, device_latency_secs: f64) -> f64 {
diff --cc crates/editor/src/lib.rs
index 14377d1b5,16a618e21..afe97ba7b
--- a/crates/editor/src/lib.rs
+++ b/crates/editor/src/lib.rs
@@@ -14,7 -14,9 +14,9 @@@ mod segments
mod telemetry;
mod thumbnail;
-pub use audio::{AudioRenderer, AudioSegment, MusicTracks};
+pub use audio::{AudioRenderer, AudioSegment, MusicTracks, release_playback_audio_caches};
+ #[cfg(feature = "test-hooks")]
+ pub use audio_output::OfflineAudioSink;
pub use audio_output::{
AudioOutput, HEADLESS_BLOCK_FRAMES, HEADLESS_CHANNELS, HEADLESS_SAMPLE_RATE, HeadlessAudioTap,
PlaySpec,