Factor out some common logic from Player::thread_func().

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index da63f10647ab58f67f5c49ec194860a5d35b6580..f4fae1c7d658db621823bb7512dabe2dad96b41f 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -234,28 +234,8 @@ void Player::play_playlist_once()
                        }
 
                        if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0) {
-                               auto display_func = [this, primary_stream_idx, frame_lower, secondary_frame, fade_alpha]{
-                                       if (destination != nullptr) {
-                                               destination->setFrame(primary_stream_idx, frame_lower, secondary_frame, fade_alpha);
-                                       }
-                               };
-                               if (video_stream == nullptr) {
-                                       display_func();
-                               } else {
-                                       if (secondary_stream_idx == -1) {
-                                               ++metric_original_frame;
-                                               video_stream->schedule_original_frame(
-                                                       next_frame_start, pts, display_func, QueueSpotHolder(this),
-                                                       frame_lower);
-                                       } else {
-                                               assert(secondary_frame.pts != -1);
-                                               ++metric_faded_frame;
-                                               video_stream->schedule_faded_frame(next_frame_start, pts, display_func,
-                                                       QueueSpotHolder(this), frame_lower,
-                                                       secondary_frame, fade_alpha);
-                                       }
-                               }
-                               last_pts_played = frame_lower.pts;
+                               display_single_frame(primary_stream_idx, frame_lower, secondary_stream_idx,
+                                                    secondary_frame, fade_alpha, next_frame_start, /*snapped=*/false);
                                continue;
                        }
 
@@ -266,30 +246,10 @@ void Player::play_playlist_once()
                        bool snapped = false;
                        for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) {
                                if (fabs(snap_frame.pts - in_pts) < pts_snap_tolerance) {
-                                       auto display_func = [this, primary_stream_idx, snap_frame, secondary_frame, fade_alpha]{
-                                               if (destination != nullptr) {
-                                                       destination->setFrame(primary_stream_idx, snap_frame, secondary_frame, fade_alpha);
-                                               }
-                                       };
-                                       if (video_stream == nullptr) {
-                                               display_func();
-                                       } else {
-                                               if (secondary_stream_idx == -1) {
-                                                       ++metric_original_snapped_frame;
-                                                       video_stream->schedule_original_frame(
-                                                               next_frame_start, pts, display_func,
-                                                               QueueSpotHolder(this), snap_frame);
-                                               } else {
-                                                       assert(secondary_frame.pts != -1);
-                                                       ++metric_faded_snapped_frame;
-                                                       video_stream->schedule_faded_frame(
-                                                               next_frame_start, pts, display_func, QueueSpotHolder(this),
-                                                               snap_frame, secondary_frame, fade_alpha);
-                                               }
-                                       }
+                                       display_single_frame(primary_stream_idx, snap_frame, secondary_stream_idx,
+                                                            secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true);
                                        in_pts_origin += snap_frame.pts - in_pts;
                                        snapped = true;
-                                       last_pts_played = snap_frame.pts;
                                        break;
                                }
                        }
@@ -377,6 +337,40 @@ void Player::play_playlist_once()
        }
 }
 
+void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, steady_clock::time_point frame_start, bool snapped)
+{
+               auto display_func = [this, primary_stream_idx, primary_frame, secondary_frame, fade_alpha]{
+               if (destination != nullptr) {
+                       destination->setFrame(primary_stream_idx, primary_frame, secondary_frame, fade_alpha);
+               }
+       };
+       if (video_stream == nullptr) {
+               display_func();
+       } else {
+               if (secondary_stream_idx == -1) {
+                       if (snapped) {
+                               ++metric_original_snapped_frame;
+                       } else {
+                               ++metric_original_frame;
+                       }
+                       video_stream->schedule_original_frame(
+                               frame_start, pts, display_func, QueueSpotHolder(this),
+                               primary_frame);
+               } else {
+                       assert(secondary_frame.pts != -1);
+                       if (snapped) {
+                               ++metric_faded_snapped_frame;
+                       } else {
+                               ++metric_faded_frame;
+                       }
+                       video_stream->schedule_faded_frame(frame_start, pts, display_func,
+                               QueueSpotHolder(this), primary_frame,
+                               secondary_frame, fade_alpha);
+               }
+       }
+       last_pts_played = primary_frame.pts;
+}
+
 // Find the frame immediately before and after this point.
 bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper)
 {

diff --git a/futatabi/player.h b/futatabi/player.h
index 92b6eea5e257136e27cb700c533867460e91a7d3..27676e3f9480e750e97427e86ce748e38fb44197 100644 (file)
--- 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);