Some clang-formatting of Futatabi.

[nageru] / futatabi / player.h

diff --git a/futatabi/player.h b/futatabi/player.h
index 5485bdffaad31ce476f733b714d5f070802772cd..549b1f388bc8d5717db64a3a0858cec1c96c648a 100644 (file)
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -33,7 +33,7 @@ public:
        ~Player();
 
        void play(const std::vector<Clip> &clips);
-       void override_angle(unsigned stream_idx);  // For the current clip only.
+       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.
@@ -51,7 +51,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);
@@ -61,7 +63,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;
@@ -69,7 +71,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<Clip> 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.
@@ -77,20 +79,24 @@ 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.
        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)