class QSurface;
class QSurfaceFormat;
-double compute_time_left(const std::vector<Clip> &clips, const std::map<size_t, double> &progress);
-
class Player : public QueueInterface {
public:
enum StreamOutput {
Player(JPEGFrameView *destination, StreamOutput stream_output, AVFormatContext *file_avctx = nullptr);
~Player();
- void play(const std::vector<Clip> &clips);
+ struct ClipWithRow {
+ Clip clip;
+ size_t row; // Used for progress callback only.
+ };
+ void play(const Clip &clip)
+ {
+ play({ ClipWithRow{ clip, 0 } });
+ }
+ void play(const std::vector<ClipWithRow> &clips);
void override_angle(unsigned stream_idx); // Assumes one-clip playlist only.
// Not thread-safe to set concurrently with playing.
// Not thread-safe to set concurrently with playing.
// Will be called back from the player thread.
- // The keys in the given map are indexes in the vector given to play().
- using progress_callback_func = std::function<void(const std::map<size_t, double> &progress)>;
+ // The keys in the given map are row members in the vector given to play().
+ using progress_callback_func = std::function<void(const std::map<size_t, double> &progress, double time_remaining)>;
void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
// QueueInterface.
void release_queue_spot() override;
private:
- void thread_func(StreamOutput stream_output, AVFormatContext *file_avctx);
+ 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);
bool find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper);
std::thread player_thread;
- std::atomic<bool> should_quit{false};
+ std::atomic<bool> should_quit{ false };
JPEGFrameView *destination;
done_callback_func done_callback;
std::mutex queue_state_mu;
std::condition_variable new_clip_changed;
- std::vector<Clip> queued_clip_list; // Under queue_state_mu.
+ std::vector<ClipWithRow> queued_clip_list; // Under queue_state_mu.
bool new_clip_ready = false; // Under queue_state_mu.
bool playing = false; // Under queue_state_mu.
int override_stream_idx = -1; // Under queue_state_mu.
std::unique_ptr<VideoStream> video_stream; // Can be nullptr.
- std::atomic<int64_t> metric_dropped_interpolated_frame{0};
- std::atomic<int64_t> metric_dropped_unconditional_frame{0};
- std::atomic<int64_t> metric_faded_frame{0};
- std::atomic<int64_t> metric_faded_snapped_frame{0};
- std::atomic<int64_t> metric_original_frame{0};
- std::atomic<int64_t> metric_original_snapped_frame{0};
- std::atomic<int64_t> metric_refresh_frame{0};
- std::atomic<int64_t> metric_interpolated_frame{0};
- std::atomic<int64_t> metric_interpolated_faded_frame{0};
+ std::atomic<int64_t> metric_dropped_interpolated_frame{ 0 };
+ std::atomic<int64_t> metric_dropped_unconditional_frame{ 0 };
+ std::atomic<int64_t> metric_faded_frame{ 0 };
+ std::atomic<int64_t> metric_faded_snapped_frame{ 0 };
+ std::atomic<int64_t> metric_original_frame{ 0 };
+ std::atomic<int64_t> metric_original_snapped_frame{ 0 };
+ std::atomic<int64_t> metric_refresh_frame{ 0 };
+ std::atomic<int64_t> metric_interpolated_frame{ 0 };
+ std::atomic<int64_t> metric_interpolated_faded_frame{ 0 };
// under queue_state_mu. Part of this instead of VideoStream so that we own
// its lock and can sleep on it.
size_t num_queued_frames = 0;
static constexpr size_t max_queued_frames = 10;
+
+ // State private to the player thread.
+ int64_t pts = 0;
+ const StreamOutput stream_output;
};
+double compute_time_left(const std::vector<Player::ClipWithRow> &clips, size_t currently_playing_idx, double progress_currently_playing);
+
+static inline double compute_total_time(const std::vector<Player::ClipWithRow> &clips)
+{
+ return compute_time_left(clips, 0, 0.0);
+}
+
#endif // !defined(_PLAYER_H)