X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=549b1f388bc8d5717db64a3a0858cec1c96c648a;hb=4a9e97065dade428e373a83618bc973cd93cbe52;hp=92b6eea5e257136e27cb700c533867460e91a7d3;hpb=5ec5103f6c772770d0d2ebf1b7be758fe538a65b;p=nageru

diff --git a/futatabi/player.h b/futatabi/player.h
index 92b6eea..549b1f3 100644
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -53,6 +53,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);
 	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);
@@ -62,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;
@@ -70,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.
@@ -78,15 +79,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.