Skip to content

Correctly draw videos that have different bounds than the size of their actual frame data #4154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Herschel merged 1 commit into from
Apr 27, 2021
Merged

Correctly draw videos that have different bounds than the size of their actual frame data #4154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions core/src/display_object/video.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use crate::avm1::{Object as Avm1Object, StageObject as Avm1StageObject};
use crate::avm2::{Object as Avm2Object, StageObject as Avm2StageObject};
use crate::backend::render::BitmapHandle;
use crate::backend::render::BitmapInfo;
use crate::backend::video::{EncodedFrame, VideoStreamHandle};
use crate::bounding_box::BoundingBox;
use crate::collect::CollectWrapper;
Expand Down Expand Up @@ -40,7 +40,7 @@ pub struct VideoData<'gc> {
stream: VideoStream,

/// The last decoded frame in the video stream.
decoded_frame: Option<(u32, CollectWrapper<BitmapHandle>)>,
decoded_frame: Option<(u32, CollectWrapper<BitmapInfo>)>,

/// AVM representation of this video player.
object: Option<AvmObject<'gc>>,
Expand Down Expand Up @@ -248,7 +248,6 @@ impl<'gc> Video<'gc> {
context
.video
.decode_video_stream_frame(*stream, encframe, context.renderer)
.map(|bi| bi.handle)
}
None => {
if let Some((_old_id, old_frame)) = &read.decoded_frame {
Expand Down Expand Up @@ -415,9 +414,19 @@ impl<'gc> TDisplayObject<'gc> for Video<'gc> {
context.transform_stack.push(&*self.transform());

if let Some((_frame_id, ref bitmap)) = self.0.read().decoded_frame {
let mut transform = context.transform_stack.transform().clone();
let bounds = self.self_bounds();

// The actual decoded frames might be different in size than the declared
// bounds of the VideoStream tag, so a final scale adjustment has to be done.
transform.matrix *= Matrix::scale(
bounds.width().to_pixels() as f32 / bitmap.0.width as f32,
bounds.height().to_pixels() as f32 / bitmap.0.height as f32,
);

context
.renderer
.render_bitmap(bitmap.0, context.transform_stack.transform(), false);
.render_bitmap(bitmap.0.handle, &transform, false);
} else {
log::warn!("Video has no decoded frame to render.");
}
Expand Down