Be more lenient about the playlist focus; this was too much (we should at least be...

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 34beda78f98667d95059a65b8028b141887f8c34..876c8dcac6b95684e54a4cfb3f354eed8331806c 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -114,6 +114,7 @@ void Player::play_playlist_once()
        bool clip_ready;
        steady_clock::time_point before_sleep = steady_clock::now();
        string pause_status;
+       float master_speed = 1.0f;
 
        // Wait until we're supposed to play something.
        {
@@ -143,13 +144,14 @@ void Player::play_playlist_once()
        if (!clip_ready) {
                if (video_stream != nullptr) {
                        ++metric_refresh_frame;
-                       string subtitle = "Futatabi " NAGERU_VERSION ";PAUSED;" + pause_status;
+                       string subtitle = "Futatabi " NAGERU_VERSION ";PAUSED;0.000;" + pause_status;
                        video_stream->schedule_refresh_frame(steady_clock::now(), pts, /*display_func=*/nullptr, QueueSpotHolder(),
                                subtitle);
                }
                return;
        }
 
+       should_skip_to_next = false;  // To make sure we don't have a lingering click from before play.
        steady_clock::time_point origin = steady_clock::now();  // TODO: Add a 100 ms buffer for ramp-up?
        int64_t in_pts_origin = clip_list[0].clip.pts_in;
        for (size_t clip_idx = 0; clip_idx < clip_list.size(); ++clip_idx) {
@@ -180,13 +182,26 @@ void Player::play_playlist_once()
                }
 
                steady_clock::time_point next_frame_start;
-               for (int frameno = 0; !should_quit; ++frameno) {  // Ends when the clip ends.
+               for (int64_t frameno = 0; !should_quit; ++frameno) {  // Ends when the clip ends.
                        double out_pts = out_pts_origin + TIMEBASE * frameno / global_flags.output_framerate;
                        next_frame_start =
                                origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE));
-                       int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip->speed / global_flags.output_framerate);
+                       int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip->speed * master_speed / global_flags.output_framerate);
                        pts = lrint(out_pts);
 
+                       float new_master_speed = change_master_speed.exchange(0.0f / 0.0f);
+                       if (!std::isnan(new_master_speed)) {
+                               master_speed = new_master_speed;
+                               in_pts_origin = in_pts - TIMEBASE * frameno * clip->speed * master_speed / global_flags.output_framerate;
+                               out_pts_origin = out_pts - TIMEBASE * frameno / global_flags.output_framerate;
+                       }
+
+                       if (should_skip_to_next.exchange(false)) {  // Test and clear.
+                               Clip *clip = &clip_list[clip_idx].clip;  // Get a non-const pointer.
+                               fprintf(stderr, "pts_out moving to first of %ld and %ld (currently at %f)\n", clip->pts_out, lrint(out_pts + clip->fade_time_seconds * TIMEBASE), out_pts);
+                               clip->pts_out = std::min(clip->pts_out, lrint(in_pts + clip->fade_time_seconds * clip->speed * TIMEBASE));
+                       }
+
                        if (in_pts >= clip->pts_out) {
                                break;
                        }
@@ -194,7 +209,6 @@ void Player::play_playlist_once()
                        {
                                lock_guard<mutex> lock(queue_state_mu);
                                if (splice_ready) {
-                                       fprintf(stderr, "splicing\n");
                                        if (next_clip == nullptr) {
                                                do_splice(to_splice_clip_list, clip_idx, -1, &clip_list);
                                        } else {
@@ -343,7 +357,7 @@ void Player::play_playlist_once()
                        // 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.
                        // TODO: Snap secondary (fade-to) clips in the same fashion.
-                       double pts_snap_tolerance = 0.01 * double(TIMEBASE) / global_flags.output_framerate;
+                       double pts_snap_tolerance = 0.01 * double(TIMEBASE) * clip->speed / global_flags.output_framerate;
                        bool snapped = false;
                        for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) {
                                if (fabs(snap_frame.pts - in_pts) < pts_snap_tolerance) {
@@ -506,11 +520,12 @@ Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, A
 Player::~Player()
 {
        should_quit = true;
+       new_clip_changed.notify_all();
+       player_thread.join();
+
        if (video_stream != nullptr) {
                video_stream->stop();
        }
-       new_clip_changed.notify_all();
-       player_thread.join();
 }
 
 void Player::play(const vector<ClipWithID> &clips)
@@ -525,7 +540,7 @@ void Player::play(const vector<ClipWithID> &clips)
 
 void Player::splice_play(const vector<ClipWithID> &clips)
 {
-        lock_guard<mutex> lock(queue_state_mu);
+       lock_guard<mutex> lock(queue_state_mu);
        if (new_clip_ready) {
                queued_clip_list = clips;
                assert(!splice_ready);
@@ -588,7 +603,7 @@ void Player::release_queue_spot()
        new_clip_changed.notify_all();
 }
 
-double compute_time_left(const vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing) 
+double compute_time_left(const vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing)
 {
        // Look at the last clip and then start counting from there.
        double remaining = 0.0;