ElyShow: show layers come one per reply, so large slides play (R2.20)
This commit is contained in:
5 files changed
+68
-10
No files matched your search
@@ -180,7 +180,21 @@ impl Doc {
|
||||
.u64(u64::from(pixels.0))
|
||||
.u64(u64::from(pixels.1))
|
||||
.bytes();
|
||||
crate::show::layers(&worker.request(tag::SLIDE_LAYERS, &request)?)
|
||||
let head = worker.request(tag::SLIDE_LAYERS, &request)?;
|
||||
let mut unpack = Unpack::new(&head);
|
||||
let (width, height, count) = (unpack.u64()?, unpack.u64()?, unpack.u64()?);
|
||||
// One layer per reply keeps each frame small.
|
||||
let mut whole = Pack::new().u64(width).u64(height).u64(count);
|
||||
for index in 0..count {
|
||||
let (json, painted) = (unpack.str()?, unpack.u64()?);
|
||||
whole = whole.str(&json).u64(painted);
|
||||
if painted != 0 {
|
||||
let id = worker.doc_id(self)?;
|
||||
let reply = worker.request(tag::SLIDE_LAYER, &Pack::new().u64(id).u64(index).bytes())?;
|
||||
whole = whole.blob(&Unpack::new(&reply).blob()?);
|
||||
}
|
||||
}
|
||||
crate::show::layers(&whole.bytes())
|
||||
}
|
||||
|
||||
/// Saves to `url` as `format`; failure surfaces (LOK-09).
|
||||
|
||||
@@ -220,3 +220,21 @@ fn an_animated_object_is_its_own_layer_under_its_effect_hash() {
|
||||
|
||||
|
||||
|
||||
|
||||
#[test]
|
||||
fn layers_larger_than_one_frame_arrive_one_by_one() {
|
||||
if install().is_none() {
|
||||
eprintln!("SKIP: no pinned LOK build");
|
||||
return;
|
||||
}
|
||||
let (_dir, mut worker, doc) = open_deck();
|
||||
worker.run(&doc, "draw.shape", &["rectangle", "true"]).expect("draws");
|
||||
let json = serde_json::json!({ "preset": "ooo-entrance-fade-in" }).to_string();
|
||||
worker.run(&doc, "animation.add", &[&json]).expect("adds");
|
||||
// Three layers at this size pass one 64 MB frame.
|
||||
let layers = doc.slide_layers(&mut worker, 0, (5000, 2812)).expect("layers");
|
||||
let (w, h) = layers.size;
|
||||
let bytes = w as usize * h as usize * 4;
|
||||
assert!(layers.list.len() * bytes > crate::ipc::MAX_FRAME, "{} layers of {bytes}", layers.list.len());
|
||||
assert!(layers.list.iter().all(|layer| layer.pixels.len() == bytes), "every layer arrives whole");
|
||||
}
|
||||
Reference in new issue
Block a user