Fix absolute seeking when the base rate is not 1/1000.

[pkanalytics] / video_widget.cpp

diff --git a/video_widget.cpp b/video_widget.cpp
index 1d899d2507182f8f7c6d98cc206632101d97b85f..0a7ff43eb7b2f4f77637e2553b9717e73e3653da 100644 (file)
--- a/video_widget.cpp
+++ b/video_widget.cpp
@@ -139,7 +139,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;
                }
@@ -492,6 +492,7 @@ void VideoWidget::wheelEvent(QWheelEvent *event)
        matmul3x3(tmp2, translation_matrix, zoom_matrix);
 
        fixup_zoom_matrix();
+       update();
 }
 
 void VideoWidget::mousePressEvent(QMouseEvent *e)
@@ -526,6 +527,8 @@ void VideoWidget::mouseMoveEvent(QMouseEvent *e)
 
        last_drag_x = e->position().x();
        last_drag_y = e->position().y();
+
+       update();
 }
 
 // Normalize the matrix so that we never get skew or similar,
@@ -737,15 +740,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);