diff --git a/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp b/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp index a3315fac00..db7bc3dd86 100644 --- a/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp +++ b/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp @@ -112,7 +112,7 @@ void VideoPlayerWidget::close_file() void VideoPlayerWidget::open_file(StringView filename) { - auto load_file_result = Video::PlaybackManager::from_file(*this, filename); + auto load_file_result = Video::PlaybackManager::from_file(filename); if (load_file_result.is_error()) { on_decoding_error(load_file_result.release_error()); @@ -121,9 +121,30 @@ void VideoPlayerWidget::open_file(StringView filename) m_path = filename; update_title(); - close_file(); + m_playback_manager = load_file_result.release_value(); + + m_playback_manager->on_video_frame = [this](auto frame) { + m_video_display->set_bitmap(move(frame)); + m_video_display->repaint(); + + update_seek_slider_max(); + set_current_timestamp(m_playback_manager->current_playback_time()); + }; + + m_playback_manager->on_playback_state_change = [this]() { + update_play_pause_icon(); + }; + + m_playback_manager->on_decoder_error = [this](auto error) { + on_decoding_error(error); + }; + + m_playback_manager->on_fatal_playback_error = [this](auto) { + close_file(); + }; + update_seek_slider_max(); resume_playback(); } @@ -240,32 +261,6 @@ void VideoPlayerWidget::set_time_label(Time timestamp) m_timestamp_label->set_text(string_builder.string_view()); } -void VideoPlayerWidget::event(Core::Event& event) -{ - if (event.type() == Video::EventType::DecoderErrorOccurred) { - auto& error_event = static_cast(event); - on_decoding_error(error_event.error()); - error_event.accept(); - } else if (event.type() == Video::EventType::VideoFramePresent) { - auto& frame_event = static_cast(event); - - m_video_display->set_bitmap(frame_event.frame()); - m_video_display->repaint(); - - update_seek_slider_max(); - set_current_timestamp(m_playback_manager->current_playback_time()); - - frame_event.accept(); - } else if (event.type() == Video::EventType::PlaybackStateChange) { - update_play_pause_icon(); - event.accept(); - } else if (event.type() == Video::EventType::FatalPlaybackError) { - close_file(); - } - - Widget::event(event); -} - void VideoPlayerWidget::drop_event(GUI::DropEvent& event) { event.accept(); diff --git a/Userland/Applications/VideoPlayer/VideoPlayerWidget.h b/Userland/Applications/VideoPlayer/VideoPlayerWidget.h index b99e8a2fae..20fdaacc54 100644 --- a/Userland/Applications/VideoPlayer/VideoPlayerWidget.h +++ b/Userland/Applications/VideoPlayer/VideoPlayerWidget.h @@ -51,8 +51,6 @@ private: void toggle_fullscreen(); - void event(Core::Event&) override; - virtual void drop_event(GUI::DropEvent&) override; DeprecatedString m_path; diff --git a/Userland/Libraries/LibVideo/PlaybackManager.cpp b/Userland/Libraries/LibVideo/PlaybackManager.cpp index 95966a1fdb..21aa997fbc 100644 --- a/Userland/Libraries/LibVideo/PlaybackManager.cpp +++ b/Userland/Libraries/LibVideo/PlaybackManager.cpp @@ -25,7 +25,27 @@ namespace Video { _fatal_expression.release_value(); \ }) -DecoderErrorOr> PlaybackManager::from_file(Core::Object& event_handler, StringView filename) +class DefaultPlaybackTimer final : public PlaybackTimer { +public: + static ErrorOr> create(int interval_ms, Function&& timeout_handler) + { + auto timer = TRY(Core::Timer::create_single_shot(interval_ms, move(timeout_handler))); + return adopt_nonnull_own_or_enomem(new (nothrow) DefaultPlaybackTimer(move(timer))); + } + + virtual void start() override { m_timer->start(); } + virtual void start(int interval_ms) override { m_timer->start(interval_ms); } + +private: + explicit DefaultPlaybackTimer(NonnullRefPtr timer) + : m_timer(move(timer)) + { + } + + NonnullRefPtr m_timer; +}; + +DecoderErrorOr> PlaybackManager::from_file(StringView filename, PlaybackTimerCreator playback_timer_creator) { NonnullOwnPtr demuxer = TRY(Matroska::MatroskaDemuxer::from_file(filename)); auto video_tracks = TRY(demuxer->get_tracks_for_type(TrackType::Video)); @@ -35,20 +55,24 @@ DecoderErrorOr> PlaybackManager::from_file(Core:: dbgln_if(PLAYBACK_MANAGER_DEBUG, "Selecting video track number {}", track.identifier()); - return make(event_handler, demuxer, track, make()); + return make(demuxer, track, make(), move(playback_timer_creator)); } -PlaybackManager::PlaybackManager(Core::Object& event_handler, NonnullOwnPtr& demuxer, Track video_track, NonnullOwnPtr&& decoder) - : m_event_handler(event_handler) - , m_main_loop(Core::EventLoop::current()) - , m_demuxer(move(demuxer)) +PlaybackManager::PlaybackManager(NonnullOwnPtr& demuxer, Track video_track, NonnullOwnPtr&& decoder, PlaybackTimerCreator playback_timer_creator) + : m_demuxer(move(demuxer)) , m_selected_video_track(video_track) , m_decoder(move(decoder)) , m_frame_queue(make()) , m_playback_handler(make(*this, false)) { - m_present_timer = Core::Timer::create_single_shot(0, [&] { timer_callback(); }).release_value_but_fixme_should_propagate_errors(); - m_decode_timer = Core::Timer::create_single_shot(0, [&] { on_decode_timer(); }).release_value_but_fixme_should_propagate_errors(); + if (playback_timer_creator) { + m_present_timer = playback_timer_creator(0, [&] { timer_callback(); }).release_value_but_fixme_should_propagate_errors(); + m_decode_timer = playback_timer_creator(0, [&] { on_decode_timer(); }).release_value_but_fixme_should_propagate_errors(); + } else { + m_present_timer = DefaultPlaybackTimer::create(0, [&] { timer_callback(); }).release_value_but_fixme_should_propagate_errors(); + m_decode_timer = DefaultPlaybackTimer::create(0, [&] { on_decode_timer(); }).release_value_but_fixme_should_propagate_errors(); + } + TRY_OR_FATAL_ERROR(m_playback_handler->on_enter()); } @@ -84,9 +108,8 @@ void PlaybackManager::dispatch_fatal_error(Error error) dbgln_if(PLAYBACK_MANAGER_DEBUG, "Encountered fatal error: {}", error.string_literal()); // FIXME: For threading, this will have to use a pre-allocated event to send to the main loop // to be able to gracefully handle OOM. - VERIFY(&m_main_loop == &Core::EventLoop::current()); - FatalPlaybackErrorEvent event { move(error) }; - m_event_handler.dispatch_event(event); + if (on_fatal_playback_error) + on_fatal_playback_error(move(error)); } void PlaybackManager::dispatch_decoder_error(DecoderError error) @@ -99,14 +122,18 @@ void PlaybackManager::dispatch_decoder_error(DecoderError error) default: dbgln("Playback error encountered: {}", error.string_literal()); TRY_OR_FATAL_ERROR(m_playback_handler->stop()); - m_main_loop.post_event(m_event_handler, make(move(error))); + + if (on_decoder_error) + on_decoder_error(move(error)); + break; } } void PlaybackManager::dispatch_new_frame(RefPtr frame) { - m_main_loop.post_event(m_event_handler, make(frame)); + if (on_video_frame) + on_video_frame(move(frame)); } bool PlaybackManager::dispatch_frame_queue_item(FrameQueueItem&& item) @@ -123,7 +150,8 @@ bool PlaybackManager::dispatch_frame_queue_item(FrameQueueItem&& item) void PlaybackManager::dispatch_state_change() { - m_main_loop.post_event(m_event_handler, TRY_OR_FATAL_ERROR(try_make())); + if (on_playback_state_change) + on_playback_state_change(); } void PlaybackManager::timer_callback() diff --git a/Userland/Libraries/LibVideo/PlaybackManager.h b/Userland/Libraries/LibVideo/PlaybackManager.h index 5bd9c919be..43657e193f 100644 --- a/Userland/Libraries/LibVideo/PlaybackManager.h +++ b/Userland/Libraries/LibVideo/PlaybackManager.h @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -83,6 +82,14 @@ private: static constexpr size_t FRAME_BUFFER_COUNT = 4; using VideoFrameQueue = Queue; +class PlaybackTimer { +public: + virtual ~PlaybackTimer() = default; + + virtual void start() = 0; + virtual void start(int interval_ms) = 0; +}; + class PlaybackManager { public: enum class SeekMode { @@ -92,9 +99,11 @@ public: static constexpr SeekMode DEFAULT_SEEK_MODE = SeekMode::Accurate; - static DecoderErrorOr> from_file(Core::Object& event_handler, StringView file); + using PlaybackTimerCreator = Function>(int, Function)>; - PlaybackManager(Core::Object& event_handler, NonnullOwnPtr& demuxer, Track video_track, NonnullOwnPtr&& decoder); + static DecoderErrorOr> from_file(StringView file, PlaybackTimerCreator = nullptr); + + PlaybackManager(NonnullOwnPtr& demuxer, Track video_track, NonnullOwnPtr&& decoder, PlaybackTimerCreator); void resume_playback(); void pause_playback(); @@ -110,7 +119,10 @@ public: Time current_playback_time(); Time duration(); - Function, Time)> on_frame_present; + Function)> on_video_frame; + Function on_playback_state_change; + Function on_decoder_error; + Function on_fatal_playback_error; private: class PlaybackStateHandler; @@ -137,9 +149,6 @@ private: void dispatch_state_change(); void dispatch_fatal_error(Error); - Core::Object& m_event_handler; - Core::EventLoop& m_main_loop; - Time m_last_present_in_media_time = Time::zero(); NonnullOwnPtr m_demuxer; @@ -148,10 +157,10 @@ private: NonnullOwnPtr m_frame_queue; - RefPtr m_present_timer; + OwnPtr m_present_timer; unsigned m_decoding_buffer_time_ms = 16; - RefPtr m_decode_timer; + OwnPtr m_decode_timer; NonnullOwnPtr m_playback_handler; Optional m_next_frame; @@ -201,65 +210,4 @@ private: }; }; -enum EventType : unsigned { - DecoderErrorOccurred = (('v' << 2) | ('i' << 1) | 'd') << 4, - VideoFramePresent, - PlaybackStateChange, - FatalPlaybackError, -}; - -class DecoderErrorEvent : public Core::Event { -public: - explicit DecoderErrorEvent(DecoderError error) - : Core::Event(DecoderErrorOccurred) - , m_error(move(error)) - { - } - virtual ~DecoderErrorEvent() = default; - - DecoderError const& error() { return m_error; } - -private: - DecoderError m_error; -}; - -class VideoFramePresentEvent : public Core::Event { -public: - VideoFramePresentEvent() = default; - explicit VideoFramePresentEvent(RefPtr frame) - : Core::Event(VideoFramePresent) - , m_frame(move(frame)) - { - } - virtual ~VideoFramePresentEvent() = default; - - RefPtr frame() { return m_frame; } - -private: - RefPtr m_frame; -}; - -class PlaybackStateChangeEvent : public Core::Event { -public: - explicit PlaybackStateChangeEvent() - : Core::Event(PlaybackStateChange) - { - } - virtual ~PlaybackStateChangeEvent() = default; -}; - -class FatalPlaybackErrorEvent : public Core::Event { -public: - explicit FatalPlaybackErrorEvent(Error error) - : Core::Event(FatalPlaybackError) - , m_error(move(error)) - { - } - virtual ~FatalPlaybackErrorEvent() = default; - Error const& error() { return m_error; } - -private: - Error m_error; -}; - }