Make the UI programmatically dependent on NUM_CAMERAS.

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 80e77d1bda6fccf2faf2bb276e740cff05b20635..b7b22c8add9dea82b613f06bcc710e1dd529b92d 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -47,7 +47,6 @@ void Player::thread_func(Player::StreamOutput stream_output, AVFormatContext *fi
 
        check_error();
 
-       constexpr double output_framerate = 60000.0 / 1001.0;  // FIXME: make configurable
        int64_t pts = 0;
        Clip next_clip;
        size_t next_clip_idx = size_t(-1);
@@ -115,10 +114,10 @@ got_clip:
                int64_t in_pts_start_next_clip = -1;
                steady_clock::time_point next_frame_start;
                for (int frameno = 0; !should_quit; ++frameno) {  // Ends when the clip ends.
-                       double out_pts = out_pts_origin + TIMEBASE * frameno / output_framerate;
+                       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 * speed / output_framerate);
+                       int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * speed / global_flags.output_framerate);
                        pts = lrint(out_pts);
 
                        if (in_pts >= clip.pts_out) {
@@ -139,7 +138,7 @@ got_clip:
                                if (next_clip.pts_in != -1) {
                                        got_next_clip = true;
 
-                                       double duration_next_clip = (next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed;
+                                       double duration_next_clip = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed;
                                        next_clip_fade_time = std::min(time_left_this_clip, duration_next_clip);
                                        in_pts_start_next_clip = next_clip.pts_in + lrint(next_clip_fade_time * TIMEBASE * speed);
                                }
@@ -264,7 +263,7 @@ got_clip:
                        // TODO: Snap secondary (fade-to) clips in the same fashion.
                        bool snapped = false;
                        for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) {
-                               double snap_pts_as_frameno = (snap_frame.pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
+                               double snap_pts_as_frameno = (snap_frame.pts - in_pts_origin) * global_flags.output_framerate / TIMEBASE / speed;
                                if (fabs(snap_pts_as_frameno - frameno) < 0.01) {
                                        auto display_func = [this, primary_stream_idx, snap_frame, secondary_frame, fade_alpha]{
                                                if (destination != nullptr) {
@@ -473,3 +472,27 @@ void Player::release_queue_spot()
        --num_queued_frames;
        new_clip_changed.notify_all();
 }
+
+double compute_time_left(const vector<Clip> &clips, const map<size_t, double> &progress)
+{
+       // Look at the last clip and then start counting from there.
+       assert(!progress.empty());
+       auto last_it = progress.end();
+       --last_it;
+       double remaining = 0.0;
+       double last_fade_time_seconds = 0.0;
+       for (size_t row = last_it->first; row < clips.size(); ++row) {
+               const Clip &clip = clips[row];
+               double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / 0.5;  // FIXME: stop hardcoding speed.
+               if (row == last_it->first) {
+                       // A clip we're playing: Subtract the part we've already played.
+                       remaining = clip_length * (1.0 - last_it->second);
+               } else {
+                       // A clip we haven't played yet: Subtract the part that's overlapping
+                       // with a previous clip (due to fade).
+                       remaining += max(clip_length - last_fade_time_seconds, 0.0);
+               }
+               last_fade_time_seconds = min(clip_length, clip.fade_time_seconds);
+       }
+       return remaining;
+}