mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-18 23:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Remove a FIXME and simplify the painting of video frames

Browse source 
The extra representations of a video element are unnecessary to specify
in VideoPaintable, as the playback system itself should take care of
all the details of the representation as specified.
This commit is contained in:
Zaggy1024 2025-09-12 17:39:20 -05:00 • committed by Jelle Raaijmakers
commit 850aea7e17
Notes: github-actions[bot] 2025-09-16 08:27:18 +00:00
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Libraries/LibWeb/Painting/VideoPaintable.cpp
View file

@ -74,10 +74,15 @@ void VideoPaintable::paint(DisplayListRecordingContext& context, PaintPhase phas
auto current_playback_position = video_element.current_playback_position(); auto current_playback_position = video_element.current_playback_position();
auto ready_state = video_element.ready_state(); auto ready_state = video_element.ready_state();
// NOTE: We combine the values of...
// - The first frame of the video
// - The last frame of the video to have been rendered
// - The frame of video corresponding to the current playback position
// ...into the value of VideoFrame below, as the playback system itself implements
// the details of the selection of a video frame to match the specification in this
// respect.
enum class Representation : u8 { enum class Representation : u8 {
FirstVideoFrame, VideoFrame,
CurrentVideoFrame,
LastRenderedVideoFrame,
PosterFrame, PosterFrame,
TransparentBlack, TransparentBlack,
}; };
@ -99,23 +104,27 @@ void VideoPaintable::paint(DisplayListRecordingContext& context, PaintPhase phas
// show poster flag is set // show poster flag is set
if (video_element.paused() && current_playback_position == 0 && video_element.show_poster()) { if (video_element.paused() && current_playback_position == 0 && video_element.show_poster()) {
// The video element represents its poster frame, if any, or else the first frame of the video. // The video element represents its poster frame, if any, or else the first frame of the video.
return poster_frame ? Representation::PosterFrame : Representation::FirstVideoFrame; return poster_frame ? Representation::PosterFrame : Representation::VideoFrame;
} }
// -> When the video element is paused, and the frame of video corresponding to the current playback position // -> When the video element is paused, and the frame of video corresponding to the current playback position
// is not available (e.g. because the video is seeking or buffering) // is not available (e.g. because the video is seeking or buffering)
//
// The video element represents the last frame of the video to have been rendered.
//
// NOTE: We don't need to check this condition, as seeking is asynchronous, and the last available frame
// will be kept until the seek completes.
// -> When the video element is neither potentially playing nor paused (e.g. when seeking or stalled) // -> When the video element is neither potentially playing nor paused (e.g. when seeking or stalled)
if ( if (!video_element.potentially_playing() && !video_element.paused()) {
(video_element.paused() && current_playback_position != current_frame.position)
|| (!video_element.potentially_playing() && !video_element.paused())) {
// The video element represents the last frame of the video to have been rendered. // The video element represents the last frame of the video to have been rendered.
return Representation::LastRenderedVideoFrame; return Representation::VideoFrame;
} }
// -> When the video element is paused // -> When the video element is paused
if (video_element.paused()) { if (video_element.paused()) {
// The video element represents the frame of video corresponding to the current playback position. // The video element represents the frame of video corresponding to the current playback position.
return Representation::CurrentVideoFrame; return Representation::VideoFrame;
} }
// -> Otherwise (the video element has a video channel and is potentially playing) // -> Otherwise (the video element has a video channel and is potentially playing)
@ -123,7 +132,7 @@ void VideoPaintable::paint(DisplayListRecordingContext& context, PaintPhase phas
// The video element represents the frame of video at the continuously increasing "current" position. When the // The video element represents the frame of video at the continuously increasing "current" position. When the
// current playback position changes such that the last frame rendered is no longer the frame corresponding to // current playback position changes such that the last frame rendered is no longer the frame corresponding to
// the current playback position in the video, the new frame must be rendered. // the current playback position in the video, the new frame must be rendered.
return Representation::CurrentVideoFrame; return Representation::VideoFrame;
}(); }();
auto paint_frame = [&](auto const& frame) { auto paint_frame = [&](auto const& frame) {
@ -148,11 +157,7 @@ void VideoPaintable::paint(DisplayListRecordingContext& context, PaintPhase phas
auto paint_user_agent_controls = video_element.has_attribute(HTML::AttributeNames::controls) || video_element.is_scripting_disabled(); auto paint_user_agent_controls = video_element.has_attribute(HTML::AttributeNames::controls) || video_element.is_scripting_disabled();
switch (representation) { switch (representation) {
case Representation::FirstVideoFrame: case Representation::VideoFrame:
case Representation::CurrentVideoFrame:
case Representation::LastRenderedVideoFrame:
// FIXME: We likely need to cache all (or a subset of) decoded video frames along with their position. We at least
// will need the first video frame and the last-rendered video frame.
if (current_frame.frame) if (current_frame.frame)
paint_frame(current_frame.frame); paint_frame(current_frame.frame);
if (paint_user_agent_controls) if (paint_user_agent_controls)