RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 22:27:44 +00:00
Code Issues Activity Actions

VideoPlayer: Make PlaybackManager use OwnPtr

Browse source 
VideoPlayerWidget was keeping a reference to PlaybackManager when
changing files, so the old and new managers would both send frames to
be presented at the same time, causing it to flicker back and forth
between the two videos. However, PlaybackManager no longer relies on
event bubbling to pass events to its parent. By changing it to send
events directly to an Object, it can avoid being ref counted, so that
it will get destroyed with its containing object and stop sending
events.
This commit is contained in:
Zaggy1024 2022-11-11 07:55:20 -06:00 • committed by Linus Groh
parent 5925d3b26b
commit 87aed17a46
4 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Libraries/LibVideo/PlaybackManager.h
View file

@ -91,15 +91,12 @@ private:
static constexpr size_t FRAME_BUFFER_COUNT = 4;
using VideoFrameQueue = Queue<FrameQueueItem, FRAME_BUFFER_COUNT>;
class PlaybackManager : public Core::Object {
C_OBJECT(PlaybackManager)
class PlaybackManager {
public:
static DecoderErrorOr<NonnullRefPtr<PlaybackManager>> from_file(Object* event_handler, StringView file);
static DecoderErrorOr<NonnullRefPtr<PlaybackManager>> from_data(Object* event_handler, Span<u8> data);
static DecoderErrorOr<NonnullOwnPtr<PlaybackManager>> from_file(Core::Object& event_handler, StringView file);
static DecoderErrorOr<NonnullOwnPtr<PlaybackManager>> from_data(Core::Object& event_handler, Span<u8> data);
PlaybackManager(Object* event_handler, NonnullOwnPtr<Demuxer>& demuxer, Track video_track, NonnullOwnPtr<VideoDecoder>& decoder);
~PlaybackManager() override = default;
PlaybackManager(Core::Object& event_handler, NonnullOwnPtr<Demuxer>& demuxer, Track video_track, NonnullOwnPtr<VideoDecoder>&& decoder);
void resume_playback();
void pause_playback();
@ -110,7 +107,6 @@ public:
u64 number_of_skipped_frames() const { return m_skipped_frames; }
void event(Core::Event& event) override;
void on_decoder_error(DecoderError error);
Time current_playback_time();
@ -129,6 +125,7 @@ private:
bool decode_and_queue_one_sample();
void on_decode_timer();
Core::Object& m_event_handler;
Core::EventLoop& m_main_loop;
PlaybackStatus m_status { PlaybackStatus::Stopped };