Fix a threading issue, where we would call into the Qt thread from the video thread.

[pkanalytics] / video_widget.cpp

diff --git a/video_widget.cpp b/video_widget.cpp
index b783b00651e2652608ba72b1a649c9160ee7ddaf..126e874aa53b1591e6b53d984a26cfd63a25ad1e 100644 (file)
--- a/video_widget.cpp
+++ b/video_widget.cpp
@@ -30,6 +30,8 @@ extern "C" {
 #include <vector>
 #include <unordered_set>
 
+#include "post_to_main_thread.h"
+
 #include <QOpenGLFunctions>
 #include <QWheelEvent>
 #include <QMouseEvent>
@@ -139,7 +141,7 @@ bool VideoWidget::process_queued_commands(AVFormatContext *format_ctx, AVCodecCo
                        relative_seek_ms += cmd.relative_seek_ms;
                        relative_seek_frames += cmd.relative_seek_frames;
                } else if (cmd.command == QueuedCommand::SEEK_ABSOLUTE) {
-                       base_pts = cmd.seek_ms;
+                       base_pts = av_rescale_q(cmd.seek_ms, AVRational{ 1, 1000 }, video_timebase);
                        relative_seek_ms = 0;
                        relative_seek_frames = 0;
                }
@@ -497,7 +499,11 @@ void VideoWidget::wheelEvent(QWheelEvent *event)
 
 void VideoWidget::mousePressEvent(QMouseEvent *e)
 {
-       if (e->button() == Qt::LeftButton) {
+       if (e->button() == Qt::BackButton) {
+               emit mouse_back_clicked();
+       } else if (e->button() == Qt::ForwardButton) {
+               emit mouse_forward_clicked();
+       } else if (e->button() == Qt::LeftButton) {
                dragging = true;
                last_drag_x = e->position().x();
                last_drag_y = e->position().y();
@@ -740,15 +746,14 @@ AVFrameWithDeleter VideoWidget::decode_frame(AVFormatContext *format_ctx, AVCode
        AVFrameWithDeleter video_avframe = av_frame_alloc_unique();
        bool eof = false;
        do {
-               AVPacket pkt;
+               AVPacket *pkt = av_packet_alloc();
                unique_ptr<AVPacket, decltype(av_packet_unref)*> pkt_cleanup(
-                       &pkt, av_packet_unref);
-               av_init_packet(&pkt);
-               pkt.data = nullptr;
-               pkt.size = 0;
-               if (av_read_frame(format_ctx, &pkt) == 0) {
-                       if (pkt.stream_index == video_stream_index) {
-                               if (avcodec_send_packet(video_codec_ctx, &pkt) < 0) {
+                       pkt, av_packet_unref);
+               pkt->data = nullptr;
+               pkt->size = 0;
+               if (av_read_frame(format_ctx, pkt) == 0) {
+                       if (pkt->stream_index == video_stream_index) {
+                               if (avcodec_send_packet(video_codec_ctx, pkt) < 0) {
                                        fprintf(stderr, "%s: Cannot send packet to video codec.\n", pathname.c_str());
                                        *error = true;
                                        return AVFrameWithDeleter(nullptr);
@@ -943,7 +948,9 @@ void VideoWidget::store_pts(int64_t pts)
 {
        last_pts = pts;
        last_position = lrint(pts * double(video_timebase.num) / double(video_timebase.den) * 1000);
-       emit position_changed(last_position);
+       post_to_main_thread([this, last_position{last_position.load()}] {
+               emit position_changed(last_position);
+       });
 }
 
 // Taken from Movit (see the comment there for explanation)