Put the video displays on the right side, making them generally larger.

[nageru] / player.h

diff --git a/player.h b/player.h
index 960bc22fcd713f2f7a58d4a9e168f78958206c0e..a10a7cb9671f09924b5eda46266d6a492baccb25 100644 (file)
--- a/player.h
+++ b/player.h
@@ -3,7 +3,57 @@
 
 #include "clip_list.h"
 
-void start_player_thread();
-void play_clip(const Clip &clip, unsigned stream_idx);
+extern "C" {
+#include <libavformat/avio.h>
+}
+
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+
+class JPEGFrameView;
+class VideoStream;
+class QSurface;
+class QSurfaceFormat;
+
+class Player {
+public:
+       Player(JPEGFrameView *destination, bool also_output_to_stream);
+
+       void play_clip(const Clip &clip, unsigned stream_idx);
+       void override_angle(unsigned stream_idx);  // For the current clip only.
+
+       // Not thread-safe to set concurrently with playing.
+       // Will be called back from the player thread.
+       using done_callback_func = std::function<void()>;
+       void set_done_callback(done_callback_func cb) { done_callback = cb; }
+
+       // Not thread-safe to set concurrently with playing.
+       // Will be called back from the player thread.
+       using progress_callback_func = std::function<void(double played_this_clip, double total_length)>;
+       void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
+
+private:
+       void thread_func(bool also_output_to_stream);
+       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);
+
+       JPEGFrameView *destination;
+       done_callback_func done_callback;
+       progress_callback_func progress_callback;
+
+       std::mutex mu;
+       Clip current_clip;  // Under mu. Can have pts_in = -1 for no clip.
+       unsigned current_stream_idx;  // Under mu.
+
+       std::mutex queue_state_mu;
+       std::condition_variable new_clip_changed;
+       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.
+};
 
 #endif  // !defined(_PLAYER_H)