]> git.sesse.net Git - nageru/blobdiff - futatabi/player.h
Fix a dangling reference (found by GCC 14).
[nageru] / futatabi / player.h
index da5a4435da936778dbec3c606c39a312e45af953..77fb9e29b485a58ffbfbfc37273c9c9ce8e22a52 100644 (file)
@@ -4,6 +4,7 @@
 #include "clip_list.h"
 #include "frame_on_disk.h"
 #include "queue_spot_holder.h"
+#include "shared/metrics.h"
 
 extern "C" {
 #include <libavformat/avformat.h>
@@ -73,6 +74,7 @@ public:
 
        void set_master_speed(float speed)
        {
+               start_master_speed = speed;
                change_master_speed = speed;
        }
 
@@ -94,7 +96,7 @@ public:
 private:
        void thread_func(AVFormatContext *file_avctx);
        void play_playlist_once();
-       void display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, std::chrono::steady_clock::time_point frame_start, bool snapped, const std::string &subtitle);
+       void display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, std::chrono::steady_clock::time_point frame_start, bool snapped, const std::string &subtitle, bool play_audio);
        void open_output_stream();
        static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
        int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
@@ -106,6 +108,7 @@ private:
        std::thread player_thread;
        std::atomic<bool> should_quit{ false };
        std::atomic<bool> should_skip_to_next{ false };
+       std::atomic<float> start_master_speed{ 1.0f };
        std::atomic<float> change_master_speed{ 0.0f / 0.0f };
 
        JPEGFrameView *destination;
@@ -135,6 +138,7 @@ private:
        std::atomic<int64_t> metric_refresh_frame{ 0 };
        std::atomic<int64_t> metric_interpolated_frame{ 0 };
        std::atomic<int64_t> metric_interpolated_faded_frame{ 0 };
+       Summary metric_player_ahead_seconds;
 
        // under queue_state_mu. Part of this instead of VideoStream so that we own
        // its lock and can sleep on it.