RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:28:12 +00:00
Code Issues Activity Actions

LibWeb: Track decoded video frame positions along with the frame image

Browse source 
This will be needed by the layout node, which may change what is painted
when the position of the frame image is not the same as the element's
current time.
This commit is contained in:
Timothy Flynn 2023-04-20 06:40:31 -04:00 • committed by Andreas Kling
parent 46c98dbf43
commit dd188aafb9
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/HTML/HTMLVideoElement.cpp
View file

@ -83,9 +83,9 @@ void HTMLVideoElement::set_video_track(JS::GCPtr<HTML::VideoTrack> video_track)
m_video_track = video_track;
}
void HTMLVideoElement::set_current_frame(Badge<VideoTrack>, RefPtr<Gfx::Bitmap> frame)
void HTMLVideoElement::set_current_frame(Badge<VideoTrack>, RefPtr<Gfx::Bitmap> frame, double position)
{
m_current_frame = move(frame);
m_current_frame = { move(frame), position };
layout_node()->set_needs_display();
}

11
Userland/Libraries/LibWeb/HTML/HTMLVideoElement.h
View file

@ -13,6 +13,11 @@
namespace Web::HTML {
struct VideoFrame {
RefPtr<Gfx::Bitmap> frame;
double position { 0.0 };
};
class HTMLVideoElement final : public HTMLMediaElement {
WEB_PLATFORM_OBJECT(HTMLVideoElement, HTMLMediaElement);
@ -30,8 +35,8 @@ public:
void set_video_track(JS::GCPtr<VideoTrack>);
void set_current_frame(Badge<VideoTrack>, RefPtr<Gfx::Bitmap> frame);
RefPtr<Gfx::Bitmap> const& current_frame() const { return m_current_frame; }
void set_current_frame(Badge<VideoTrack>, RefPtr<Gfx::Bitmap> frame, double position);
VideoFrame const& current_frame() const { return m_current_frame; }
void set_layout_mouse_position(Badge<Painting::VideoPaintable>, Optional<CSSPixelPoint> mouse_position) { m_mouse_position = move(mouse_position); }
Optional<CSSPixelPoint> const& layout_mouse_position(Badge<Painting::VideoPaintable>) const { return m_mouse_position; }
@ -56,7 +61,7 @@ private:
virtual void on_seek(double, MediaSeekMode) override;
JS::GCPtr<HTML::VideoTrack> m_video_track;
RefPtr<Gfx::Bitmap> m_current_frame;
VideoFrame m_current_frame;
u32 m_video_width { 0 };
u32 m_video_height { 0 };

9
Userland/Libraries/LibWeb/HTML/VideoTrack.cpp
View file

@ -30,11 +30,12 @@ VideoTrack::VideoTrack(JS::Realm& realm, JS::NonnullGCPtr<HTMLMediaElement> medi
, m_playback_manager(move(playback_manager))
{
m_playback_manager->on_video_frame = [this](auto frame) {
if (is<HTMLVideoElement>(*m_media_element))
verify_cast<HTMLVideoElement>(*m_media_element).set_current_frame({}, move(frame));
auto playback_position = static_cast<double>(position().to_milliseconds()) / 1000.0;
auto playback_position_ms = static_cast<double>(position().to_milliseconds());
m_media_element->set_current_playback_position(playback_position_ms / 1000.0);
if (is<HTMLVideoElement>(*m_media_element))
verify_cast<HTMLVideoElement>(*m_media_element).set_current_frame({}, move(frame), playback_position);
m_media_element->set_current_playback_position(playback_position);
};
m_playback_manager->on_playback_state_change = [this]() {

2
Userland/Libraries/LibWeb/Painting/VideoPaintable.cpp
View file

@ -76,7 +76,7 @@ void VideoPaintable::paint(PaintContext& context, PaintPhase phase) const
auto paint_user_agent_controls = video_element.has_attribute(HTML::AttributeNames::controls) || video_element.is_scripting_disabled();
if (auto const& bitmap = layout_box().dom_node().current_frame()) {
if (auto const& bitmap = layout_box().dom_node().current_frame().frame) {
context.painter().draw_scaled_bitmap(video_rect.to_type<int>(), *bitmap, bitmap->rect(), 1.0f, to_gfx_scaling_mode(computed_values().image_rendering()));
if (paint_user_agent_controls)