Move progress row information into Player; will be easier to track when we start...

[nageru] / futatabi / player.h

diff --git a/futatabi/player.h b/futatabi/player.h
index 22de0b396cd98be13d0f3dba1049882f616e24a4..a581a54f79dd41ae076403bb2a8b3b2831b0d029 100644 (file)
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -32,8 +32,16 @@ public:
        Player(JPEGFrameView *destination, StreamOutput stream_output, AVFormatContext *file_avctx = nullptr);
        ~Player();
 
-       void play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx);
-       void override_angle(unsigned stream_idx);  // For the current clip only.
+       struct ClipWithRow {
+               Clip clip;
+               unsigned row;  // Used for progress callback only.
+       };
+       void play(const Clip &clip)
+       {
+               play({ ClipWithRow{ clip, 0 } });
+       }
+       void play(const std::vector<ClipWithRow> &clips);
+       void override_angle(unsigned stream_idx);  // Assumes one-clip playlist only.
 
        // Not thread-safe to set concurrently with playing.
        // Will be called back from the player thread.
@@ -42,12 +50,7 @@ public:
 
        // Not thread-safe to set concurrently with playing.
        // Will be called back from the player thread.
-       // The second parameter is the clip's position in the play list.
-       using next_clip_callback_func = std::function<std::pair<Clip, size_t>()>;
-       void set_next_clip_callback(next_clip_callback_func cb) { next_clip_callback = cb; }
-
-       // Not thread-safe to set concurrently with playing.
-       // Will be called back from the player thread.
+       // The keys in the given map are row members in the vector given to play().
        using progress_callback_func = std::function<void(const std::map<size_t, double> &progress)>;
        void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
 
@@ -56,7 +59,9 @@ public:
        void release_queue_spot() override;
 
 private:
-       void thread_func(StreamOutput stream_output, AVFormatContext *file_avctx);
+       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);
        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);
@@ -66,30 +71,40 @@ private:
        bool find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper);
 
        std::thread player_thread;
-       std::atomic<bool> should_quit{false};
+       std::atomic<bool> should_quit{ false };
 
        JPEGFrameView *destination;
        done_callback_func done_callback;
-       next_clip_callback_func next_clip_callback;
        progress_callback_func progress_callback;
 
-       std::mutex mu;
-       Clip current_clip;  // Under mu. Can have pts_in = -1 for no clip.
-       size_t current_clip_idx;  // Under mu.
-       unsigned current_stream_idx;  // Under mu.
-
        std::mutex queue_state_mu;
        std::condition_variable new_clip_changed;
+       std::vector<ClipWithRow> queued_clip_list;  // Under queue_state_mu.
        bool new_clip_ready = false;  // Under queue_state_mu.
        bool playing = false;  // Under queue_state_mu.
        int override_stream_idx = -1;  // Under queue_state_mu.
+       int64_t last_pts_played = -1;  // Under queue_state_mu. Used by previews only.
 
        std::unique_ptr<VideoStream> video_stream;  // Can be nullptr.
 
+       std::atomic<int64_t> metric_dropped_interpolated_frame{ 0 };
+       std::atomic<int64_t> metric_dropped_unconditional_frame{ 0 };
+       std::atomic<int64_t> metric_faded_frame{ 0 };
+       std::atomic<int64_t> metric_faded_snapped_frame{ 0 };
+       std::atomic<int64_t> metric_original_frame{ 0 };
+       std::atomic<int64_t> metric_original_snapped_frame{ 0 };
+       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 };
+
        // under queue_state_mu. Part of this instead of VideoStream so that we own
        // its lock and can sleep on it.
        size_t num_queued_frames = 0;
        static constexpr size_t max_queued_frames = 10;
+
+       // State private to the player thread.
+       int64_t pts = 0;
+       const StreamOutput stream_output;
 };
 
 #endif  // !defined(_PLAYER_H)