X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=player.h;h=c7f8e070a71a0ce697e1c21edd14727a3892762f;hb=3795723be95f2fe82f3c8b8b45b1a905b2c811fd;hp=ab8f0787573799723ec62c6f083d8eb5334db35e;hpb=1f40445577316ae2f2df53c09147fe254cbe9772;p=nageru

diff --git a/player.h b/player.h
index ab8f078..c7f8e07 100644
--- a/player.h
+++ b/player.h
@@ -2,23 +2,27 @@
 #define _PLAYER_H 1
 
 #include "clip_list.h"
-
-#include <condition_variable>
-#include <functional>
-#include <mutex>
+#include "frame_on_disk.h"
+#include "queue_spot_holder.h"
 
 extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+
 class JPEGFrameView;
-class Mux;
+class VideoStream;
+class QSurface;
+class QSurfaceFormat;
 
-class Player {
+class Player : public QueueInterface {
 public:
-	Player(JPEGFrameView *destination);
+	Player(JPEGFrameView *destination, bool also_output_to_stream);
 
-	void play_clip(const Clip &clip, unsigned stream_idx);
+	void play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx);
 	void override_angle(unsigned stream_idx);  // For the current clip only.
 
 	// Not thread-safe to set concurrently with playing.
@@ -26,17 +30,39 @@ public:
 	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.
+	// The second parameter is the clip's position in the play list.
+	using next_clip_callback_func = std::function<std::pair<Clip, size_t>()>;
+	void set_next_clip_callback(next_clip_callback_func cb) { next_clip_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(const std::map<size_t, double> &progress)>;
+	void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
+
+	// QueueInterface.
+	void take_queue_spot() override;
+	void release_queue_spot() override;
+
 private:
-	void thread_func();
+	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);
 
+	// Find the frame immediately before and after this point.
+	// Returns false if pts is after the last frame.
+	bool find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper);
+
 	JPEGFrameView *destination;
 	done_callback_func done_callback;
+	next_clip_callback_func next_clip_callback;
+	progress_callback_func progress_callback;
 
 	std::mutex mu;
 	Clip current_clip;  // Under mu. Can have pts_in = -1 for no clip.
+	size_t current_clip_idx;  // Under mu.
 	unsigned current_stream_idx;  // Under mu.
 
 	std::mutex queue_state_mu;
@@ -45,10 +71,12 @@ private:
 	bool playing = false;  // Under queue_state_mu.
 	int override_stream_idx = -1;  // Under queue_state_mu.
 
-	// For streaming.
-	std::unique_ptr<Mux> stream_mux;  // To HTTP.
-	std::string stream_mux_header;
-	bool seen_sync_markers = false;
+	std::unique_ptr<VideoStream> video_stream;  // Can be nullptr.
+
+	// 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;
 };
 
 #endif  // !defined(_PLAYER_H)