address review: retry video feed creation when playback resumes

crates/ogg/src/lib.rs

@@ -415,11 +415,6 @@ impl CaptureScanner {
 }
 
 fn read_parts(src: &(impl ByteSource + ?Sized), parts: &[(u64, u32)]) -> Result<Vec<u8>> {
-    // Ranges come from a scan of some source; check them against this one before sizing a buffer.
-    let len = src.len();
-    if parts.iter().any(|&(o, n)| o.checked_add(u64::from(n)).is_none_or(|end| end > len)) {
-        return Err(Error::Invalid("packet range lies outside the source".into()));
-    }
     let mut v = Vec::with_capacity(parts.iter().map(|p| p.1 as usize).sum());
     for &(o, n) in parts {
         let a = v.len();

crates/ogg/src/tests.rs

@@ -274,13 +274,3 @@ fn a_budget_too_small_to_search_is_spent() {
     let f = opus_file(6, 312, 0);
     assert_eq!(scanner.find(&f, 0, f.len() as u64).unwrap(), None);
 }
-
-#[test]
-fn read_packet_checks_its_ranges_against_the_source_before_allocating() {
-    let f = opus_file(10, 312, 500);
-    let o = open(&f).unwrap();
-    let s = o.stream_of(Codec::Opus).unwrap();
-    // The last packet lies past the end of a source cut short: an error, not a read of missing bytes.
-    let short = &f[..f.len() / 2];
-    assert!(matches!(o.read_packet(&short, s, 9), Err(Error::Invalid(_))));
-}

crates/ui-egui/src/media.rs

@@ -12,6 +12,9 @@ use egui::{Align2, Color32, CornerRadius, Pos2, Rect, Sense, Stroke, TextureHand
 
 use crate::icons::{self, Icon};
 
+/// Video shapes that get a decoder at once; more play their sound without a picture.
+const MAX_VIDEO_FEEDS: usize = 16;
+
 /// Who started a voice: the editor's control bar stops when you leave the slide, the slide show
 /// manages its own.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -227,12 +230,21 @@ impl MediaHost {
             audio: clip.volume > 0.0,
         };
         let source_changed = self.owners.get(&id).is_some_and(|o| o.source != media_key);
-        if clip.video && (source_changed || !self.videos.contains_key(&id)) {
-            let feed = match VideoFeed::new(bytes.clone()) {
-                Ok(f) => Some(f),
-                Err(e) => {
-                    log::info!("video {id}: {e}");
-                    None
+        // A shape whose feed could not be had (the cap, a decode error) tries again on each play.
+        let feedless = self.videos.get(&id).is_some_and(|v| v.feed.is_none());
+        if clip.video && (source_changed || feedless || !self.videos.contains_key(&id)) {
+            // One decoder and frame queue per video shape: past the cap a shape plays its sound only.
+            let live = self.videos.iter().filter(|(vid, v)| **vid != id && v.feed.is_some()).count();
+            let feed = if live >= MAX_VIDEO_FEEDS {
+                log::info!("video {id}: more than {MAX_VIDEO_FEEDS} videos playing; showing no picture");
+                None
+            } else {
+                match VideoFeed::new(bytes.clone()) {
+                    Ok(f) => Some(f),
+                    Err(e) => {
+                        log::info!("video {id}: {e}");
+                        None
+                    }
                 }
             };
             self.videos.insert(id, Video { feed, frame: None, tex: None });

crates/ui-egui/src/show/render.rs

@@ -196,18 +196,40 @@ pub(super) fn part_textures(ctx: &egui::Context, doc: &Presentation, from: Optio
     ]
 }
 
+/// Width of a slide-show grid thumbnail, in pixels.
+const THUMB_WIDTH: f64 = 320.0;
+/// Tallest grid thumbnail, so an extreme portrait slide cannot ask for a huge raster.
+const THUMB_MAX_HEIGHT: f64 = 2048.0;
+
+/// The scale and pixel size of a grid thumbnail of a `width` x `height` slide.
+fn thumb_size(width: f64, height: f64) -> (f64, f64, f64) {
+    let (sw, sh) = (width.max(1.0), height.max(1.0));
+    let scale = (THUMB_WIDTH / sw).min(THUMB_MAX_HEIGHT / sh);
+    (scale, (sw * scale).round().max(1.0), (sh * scale).round().max(1.0))
+}
+
 pub(super) fn render_thumb(ctx: &egui::Context, show: &mut Show, doc: &Presentation, i: usize) -> Option<TextureHandle> {
     if show.thumbs.len() >= GRID_CAP {
         return None;
     }
-    let w = 320.0_f64;
-    let h = (w * doc.slide_size.height / doc.slide_size.width.max(1.0)).round().max(1.0);
-    let img = deckcraft_render::render_slide(
-        doc,
-        i,
-        &RenderOpts { scale: w / doc.slide_size.width.max(1.0), size: Some((w as u32, h as u32)), ..Default::default() },
-    );
+    // 320 wide, unless the slide is so tall that this would pass the height limit: fit that box.
+    let (scale, w, h) = thumb_size(doc.slide_size.width, doc.slide_size.height);
+    let img = deckcraft_render::render_slide(doc, i, &RenderOpts { scale, size: Some((w as u32, h as u32)), ..Default::default() });
     let tex = crate::textures::upload(ctx, format!("show-grid-{i}"), crate::textures::to_color_image(&img, false));
     show.thumbs.push((i, tex.clone()));
     Some(tex)
 }
+
+#[cfg(test)]
+mod thumb_size_tests {
+    use super::*;
+
+    #[test]
+    fn ordinary_slides_are_320_wide_and_extreme_ones_stay_in_the_height_limit() {
+        let (scale, w, h) = thumb_size(960.0, 540.0);
+        assert_eq!((w, h), (320.0, 180.0));
+        assert!((scale - 320.0 / 960.0).abs() < 1e-12);
+        let (_, w, h) = thumb_size(1.0, 1.0e9);
+        assert!(h <= THUMB_MAX_HEIGHT && w >= 1.0);
+    }
+}

xtask/src/stats.rs

@@ -18,13 +18,7 @@ fn walk(dir: &Path, c: &mut Counts) {
         let p = e.path();
         let name = e.file_name();
         let name = name.to_string_lossy();
-        // `file_type` does not follow links, so a directory link is not walked (and aliases are
-        // not counted twice).
-        let Ok(kind) = e.file_type() else { continue };
-        if kind.is_symlink() {
-            continue;
-        }
-        if kind.is_dir() {
+        if p.is_dir() {
             // Nested fuzz workspaces and build output are not part of the crate.
             if name != "target" && name != "fuzz" && !name.starts_with('.') {
                 walk(&p, c);