X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=22de0b396cd98be13d0f3dba1049882f616e24a4;hb=7c111c0bfbe6bf54cfbce8ad67e0d9b150b3d195;hp=c7f8e070a71a0ce697e1c21edd14727a3892762f;hpb=6e116a6bbeb2c047a3bfb084395ec601ce211e6c;p=nageru

diff --git a/futatabi/player.h b/futatabi/player.h
index c7f8e07..22de0b3 100644
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -6,21 +6,31 @@
 #include "queue_spot_holder.h"
 
 extern "C" {
+#include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 }
 
 #include <condition_variable>
 #include <functional>
 #include <mutex>
+#include <thread>
 
 class JPEGFrameView;
 class VideoStream;
 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:
-	Player(JPEGFrameView *destination, bool also_output_to_stream);
+	enum StreamOutput {
+		NO_STREAM_OUTPUT,
+		HTTPD_STREAM_OUTPUT,  // Output to global_httpd.
+		FILE_STREAM_OUTPUT    // Output to file_avctx.
+	};
+	Player(JPEGFrameView *destination, StreamOutput stream_output, AVFormatContext *file_avctx = nullptr);
+	~Player();
 
 	void play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx);
 	void override_angle(unsigned stream_idx);  // For the current clip only.
@@ -46,7 +56,7 @@ public:
 	void release_queue_spot() override;
 
 private:
-	void thread_func(bool also_output_to_stream);
+	void thread_func(StreamOutput stream_output, AVFormatContext *file_avctx);
 	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);
@@ -55,6 +65,9 @@ private:
 	// 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);
 
+	std::thread player_thread;
+	std::atomic<bool> should_quit{false};
+
 	JPEGFrameView *destination;
 	done_callback_func done_callback;
 	next_clip_callback_func next_clip_callback;