Move estimation of time left into Player.

[nageru] / futatabi / player.h

diff --git a/futatabi/player.h b/futatabi/player.h
index 27676e3f9480e750e97427e86ce748e38fb44197..c8ed083fd544899124f749926c9598a0b0f9d235 100644 (file)
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -20,8 +20,6 @@ class VideoStream;
 class QSurface;
 class QSurfaceFormat;
 
-double compute_time_left(const std::vector<Clip> &clips, const std::map<size_t, double> &progress);
-
 class Player : public QueueInterface {
 public:
        enum StreamOutput {
@@ -32,7 +30,15 @@ public:
        Player(JPEGFrameView *destination, StreamOutput stream_output, AVFormatContext *file_avctx = nullptr);
        ~Player();
 
-       void play(const std::vector<Clip> &clips);
+       struct ClipWithRow {
+               Clip clip;
+               size_t 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.
@@ -42,8 +48,8 @@ public:
 
        // Not thread-safe to set concurrently with playing.
        // Will be called back from the player thread.
-       // The keys in the given map are indexes in the vector given to play().
-       using progress_callback_func = std::function<void(const std::map<size_t, double> &progress)>;
+       // 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, double time_remaining)>;
        void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
 
        // QueueInterface.
@@ -63,7 +69,7 @@ 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;
@@ -71,7 +77,7 @@ private:
 
        std::mutex queue_state_mu;
        std::condition_variable new_clip_changed;
-       std::vector<Clip> queued_clip_list;   // Under queue_state_mu.
+       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.
@@ -79,15 +85,15 @@ private:
 
        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};
+       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.
@@ -99,4 +105,11 @@ private:
        const StreamOutput stream_output;
 };
 
+double compute_time_left(const std::vector<Player::ClipWithRow> &clips, size_t currently_playing_idx, double progress_currently_playing);
+
+static inline double compute_total_time(const std::vector<Player::ClipWithRow> &clips)
+{
+       return compute_time_left(clips, 0, 0.0);
+}
+
 #endif  // !defined(_PLAYER_H)