Support per-clip variable speed.

diff --git a/futatabi/clip_list.cpp b/futatabi/clip_list.cpp
index 0a3faf01a09e517e4ac49db957ed9b96fac97c2f..b456c75ca77ee4ee2a3beb029b6b62d5ada8275b 100644 (file)
--- a/futatabi/clip_list.cpp
+++ b/futatabi/clip_list.cpp
@@ -131,6 +131,7 @@ QVariant PlayList::data(const QModelIndex &parent, int role) const
                case Column::OUT:
                case Column::DURATION:
                case Column::FADE_TIME:
+               case Column::SPEED:
                        return Qt::AlignRight + Qt::AlignVCenter;
                case Column::CAMERA:
                        return Qt::AlignCenter;
@@ -192,6 +193,13 @@ QVariant PlayList::data(const QModelIndex &parent, int role) const
                ss << fixed << clips[row].fade_time_seconds;
                return QString::fromStdString(ss.str());
        }
+       case Column::SPEED: {
+               stringstream ss;
+               ss.imbue(locale("C"));
+               ss.precision(3);
+               ss << fixed << clips[row].speed;
+               return QString::fromStdString(ss.str());
+       }
        default:
                return "";
        }
@@ -242,6 +250,8 @@ QVariant PlayList::headerData(int section, Qt::Orientation orientation, int role
                return "Description";
        case Column::FADE_TIME:
                return "Fade time";
+       case Column::SPEED:
+               return "Speed";
        default:
                return "";
        }
@@ -274,7 +284,7 @@ Qt::ItemFlags PlayList::flags(const QModelIndex &index) const
        case Column::DESCRIPTION:
        case Column::CAMERA:
        case Column::FADE_TIME:
-               return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
+       case Column::SPEED:
                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
        default:
                return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
@@ -336,6 +346,16 @@ bool PlayList::setData(const QModelIndex &index, const QVariant &value, int role
                emit_data_changed(row);
                return true;
        }
+       case Column::SPEED: {
+               bool ok;
+               double val = value.toDouble(&ok);
+               if (!ok || !(val >= 0.001)) {
+                       return false;
+               }
+               clips[row].speed = val;
+               emit_data_changed(row);
+               return true;
+       }
        default:
                return false;
        }
@@ -462,6 +482,11 @@ Clip deserialize_clip(const ClipProto &clip_proto)
        }
        clip.stream_idx = clip_proto.stream_idx();
        clip.fade_time_seconds = clip_proto.fade_time_seconds();
+       if (clip_proto.speed() < 0.001) {
+               clip.speed = 0.5;  // Default.
+       } else {
+               clip.speed = clip_proto.speed();
+       }
        return clip;
 }
 
@@ -474,6 +499,7 @@ void serialize_clip(const Clip &clip, ClipProto *clip_proto)
        }
        clip_proto->set_stream_idx(clip.stream_idx);
        clip_proto->set_fade_time_seconds(clip.fade_time_seconds);
+       clip_proto->set_speed(clip.speed);
 }
 
 }  // namespace

diff --git a/futatabi/clip_list.h b/futatabi/clip_list.h
index 6fe30966a5e01a89ed68551d6b5c0119d0534299..0768c76cdbc1acdb67c37032eddefd331dd2b358 100644 (file)
--- a/futatabi/clip_list.h
+++ b/futatabi/clip_list.h
@@ -13,8 +13,11 @@
 struct Clip {
        int64_t pts_in = -1, pts_out = -1;  // pts_in is inclusive, pts_out is exclusive.
        std::string descriptions[MAX_STREAMS];
-       unsigned stream_idx = 0;  // For the playlist only.
-       double fade_time_seconds = 0.5;  // For the playlist only.
+
+       // These are for the playlist only.
+       unsigned stream_idx = 0;
+       double fade_time_seconds = 0.5;
+       double speed = 0.5;
 };
 
 class DataChangedReceiver {
@@ -106,6 +109,7 @@ public:
                CAMERA,
                DESCRIPTION,
                FADE_TIME,
+               SPEED,
                NUM_COLUMNS
        };
 

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index b7b22c8add9dea82b613f06bcc710e1dd529b92d..8aac5777cc7ef24cdc87db6112cf33b41d4dd1c7 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -108,8 +108,7 @@ got_clip:
                        }
                }
 
-               // TODO: Lock to a rational multiple of the frame rate if possible.
-               double speed = 0.5;
+               // TODO: Lock the speed to a rational multiple of the frame rate if possible.
 
                int64_t in_pts_start_next_clip = -1;
                steady_clock::time_point next_frame_start;
@@ -117,7 +116,7 @@ got_clip:
                        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 / global_flags.output_framerate);
+                       int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip.speed / global_flags.output_framerate);
                        pts = lrint(out_pts);
 
                        if (in_pts >= clip.pts_out) {
@@ -131,16 +130,16 @@ got_clip:
                                continue;
                        }
 
-                       double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / speed;
+                       double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / clip.speed;
                        if (!got_next_clip && next_clip_callback != nullptr && time_left_this_clip <= clip.fade_time_seconds) {
                                // Find the next clip so that we can begin a fade.
                                tie(next_clip, next_clip_idx) = next_clip_callback();
                                if (next_clip.pts_in != -1) {
                                        got_next_clip = true;
 
-                                       double duration_next_clip = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed;
+                                       double duration_next_clip = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / clip.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);
+                                       in_pts_start_next_clip = next_clip.pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed);
                                }
                        }
 
@@ -153,7 +152,7 @@ got_clip:
                        float fade_alpha = 0.0f;
                        if (got_next_clip && time_left_this_clip <= next_clip_fade_time) {
                                secondary_stream_idx = next_clip.stream_idx;
-                               int64_t in_pts_secondary = lrint(next_clip.pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * speed);
+                               int64_t in_pts_secondary = lrint(next_clip.pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * clip.speed);
                                in_pts_secondary_for_progress = in_pts_secondary;
                                fade_alpha = 1.0f - time_left_this_clip / next_clip_fade_time;
 
@@ -174,13 +173,13 @@ got_clip:
 
                        if (progress_callback != nullptr) {
                                // NOTE: None of this will take into account any snapping done below.
-                               double played_this_clip = double(in_pts_for_progress - clip.pts_in) / TIMEBASE / speed;
-                               double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / speed;
+                               double played_this_clip = double(in_pts_for_progress - clip.pts_in) / TIMEBASE / clip.speed;
+                               double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed;
                                map<size_t, double> progress{{ clip_idx, played_this_clip / total_length }};
 
                                if (got_next_clip && time_left_this_clip <= next_clip_fade_time) {
-                                       double played_next_clip = double(in_pts_secondary_for_progress - next_clip.pts_in) / TIMEBASE / speed;
-                                       double total_next_length = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed;
+                                       double played_next_clip = double(in_pts_secondary_for_progress - next_clip.pts_in) / TIMEBASE / next_clip.speed;
+                                       double total_next_length = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / next_clip.speed;
                                        progress[next_clip_idx] = played_next_clip / total_next_length;
                                }
                                progress_callback(progress);
@@ -263,7 +262,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) * global_flags.output_framerate / TIMEBASE / speed;
+                               double snap_pts_as_frameno = (snap_frame.pts - in_pts_origin) * global_flags.output_framerate / TIMEBASE / clip.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) {
@@ -483,7 +482,7 @@ double compute_time_left(const vector<Clip> &clips, const map<size_t, double> &p
        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.
+               double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.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);

diff --git a/futatabi/state.proto b/futatabi/state.proto
index 71e8cd6622e3d1d7628d2fbe2d5fb523fac6ff5f..c64555bd39b9389e57e6ef2b1b19145028509dd5 100644 (file)
--- a/futatabi/state.proto
+++ b/futatabi/state.proto
@@ -7,6 +7,7 @@ message ClipProto {
        repeated string description = 3;
        int64 stream_idx = 4;
        double fade_time_seconds = 5;
+       double speed = 6;
 }
 
 message ClipListProto {