Small cleanup in Player.

[nageru] / player.cpp

diff --git a/player.cpp b/player.cpp
index 1e57ded102df14eff8fbd69f7a544fed77e9a5bf..af443078c81dce95b17c4cadf66427aae8164b00 100644 (file)
--- a/player.cpp
+++ b/player.cpp
@@ -105,29 +105,10 @@ void Player::thread_func(bool also_output_to_stream)
                        }
 
                        int64_t in_pts_lower, in_pts_upper;
-
-                       // Find the frame immediately before and after this point.
-                       {
-                               lock_guard<mutex> lock(frame_mu);
-
-                               // Find the first frame such that in_pts >= frame.pts.
-                               auto it = lower_bound(frames[stream_idx].begin(),
-                                       frames[stream_idx].end(),
-                                       in_pts);
-                               if (it == frames[stream_idx].end() || *it >= clip.pts_out) {
-                                       break;
-                               }
-                               in_pts_upper = *it;
-
-                               // Find the last frame such that in_pts <= frame.pts (if any).
-                               if (it == frames[stream_idx].begin()) {
-                                       in_pts_lower = *it;
-                               } else {
-                                       in_pts_lower = *(it - 1);
-                               }
+                       bool ok = find_surrounding_frames(in_pts, stream_idx, &in_pts_lower, &in_pts_upper);
+                       if (!ok || in_pts_upper >= clip.pts_out) {
+                               break;
                        }
-                       assert(in_pts >= in_pts_lower);
-                       assert(in_pts <= in_pts_upper);
 
                        // Sleep until the next frame start, or until there's a new clip we're supposed to play.
                        {
@@ -153,28 +134,27 @@ void Player::thread_func(bool also_output_to_stream)
                        if (in_pts_lower == in_pts_upper) {
                                destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
                                if (video_stream != nullptr) {
-                                       video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
+                                       video_stream->schedule_original_frame(pts, stream_idx, in_pts_lower);
                                }
                                continue;
                        }
 
                        // Snap to input frame: If we can do so with less than 1% jitter
                        // (ie., move less than 1% of an _output_ frame), do so.
-                       double in_pts_lower_as_frameno = (in_pts_lower - in_pts_origin) * output_framerate / TIMEBASE / speed;
-                       double in_pts_upper_as_frameno = (in_pts_upper - in_pts_origin) * output_framerate / TIMEBASE / speed;
-                       if (fabs(in_pts_lower_as_frameno - frameno) < 0.01) {
-                               destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
-                               if (video_stream != nullptr) {
-                                       video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
-                               }
-                               in_pts_origin += in_pts_lower - in_pts;
-                               continue;
-                       } else if (fabs(in_pts_upper_as_frameno - frameno) < 0.01) {
-                               destination->setFrame(stream_idx, in_pts_upper, /*interpolated=*/false);
-                               if (video_stream != nullptr) {
-                                       video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_upper);
+                       bool snapped = false;
+                       for (int64_t snap_pts : { in_pts_lower, in_pts_upper }) {
+                               double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
+                               if (fabs(snap_pts_as_frameno - frameno) < 0.01) {
+                                       destination->setFrame(stream_idx, snap_pts, /*interpolated=*/false);
+                                       if (video_stream != nullptr) {
+                                               video_stream->schedule_original_frame(pts, stream_idx, snap_pts);
+                                       }
+                                       in_pts_origin += snap_pts - in_pts;
+                                       snapped = true;
+                                       break;
                                }
-                               in_pts_origin += in_pts_upper - in_pts;
+                       }
+                       if (snapped) {
                                continue;
                        }
 
@@ -192,8 +172,8 @@ void Player::thread_func(bool also_output_to_stream)
                        } else {
                                // Calculate the interpolated frame. When it's done, the destination
                                // will be unblocked.
-                               destination->setFrame(stream_idx, lrint(out_pts), /*interpolated=*/true);
-                               video_stream->schedule_interpolated_frame(lrint(out_pts), stream_idx, in_pts_lower, in_pts_upper, alpha);
+                               destination->setFrame(stream_idx, pts, /*interpolated=*/true);
+                               video_stream->schedule_interpolated_frame(pts, stream_idx, in_pts_lower, in_pts_upper, alpha);
                        }
                }
 
@@ -207,6 +187,31 @@ void Player::thread_func(bool also_output_to_stream)
        }
 }
 
+// Find the frame immediately before and after this point.
+bool Player::find_surrounding_frames(int64_t pts, int stream_idx, int64_t *pts_lower, int64_t *pts_upper)
+{
+       lock_guard<mutex> lock(frame_mu);
+
+       // Find the first frame such that frame.pts >= pts.
+       auto it = lower_bound(frames[stream_idx].begin(),
+               frames[stream_idx].end(),
+               pts);
+       if (it == frames[stream_idx].end()) {
+               return false;
+       }
+       *pts_upper = *it;
+
+       // Find the last frame such that in_pts <= frame.pts (if any).
+       if (it == frames[stream_idx].begin()) {
+               *pts_lower = *it;
+       } else {
+               *pts_lower = *(it - 1);
+       }
+       assert(pts >= *pts_lower);
+       assert(pts <= *pts_upper);
+       return true;
+}
+
 Player::Player(JPEGFrameView *destination, bool also_output_to_stream)
        : destination(destination)
 {