X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.h;h=d522ab1e8f5a98f9494004599b9c1aa2a74a76c0;hb=eaba7288c4fb39ca195c9355970293bcaf088dbc;hp=d0634e0d7b563c84d9c12b1471376009afb8003e;hpb=7188e3e948c60f78f5e2cd8756337f716de06d99;p=nageru

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index d0634e0..d522ab1 100644
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 
 extern "C" {
+#include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 }
 
@@ -13,6 +14,7 @@ extern "C" {
 #include "shared/ref_counted_gl_sync.h"
 #include "queue_spot_holder.h"
 
+#include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <deque>
@@ -34,7 +36,7 @@ class YCbCrConverter;
 
 class VideoStream {
 public:
-	VideoStream();
+	VideoStream(AVFormatContext *file_avctx);  // nullptr if output to stream.
 	~VideoStream();
 	void start();
 	void stop();
@@ -66,6 +68,7 @@ private:
 
 	void encode_thread_func();
 	std::thread encode_thread;
+	std::atomic<bool> should_quit{false};
 
 	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);
@@ -129,9 +132,11 @@ private:
 	std::deque<QueuedFrame> frame_queue;  // Under <queue_lock>.
 	std::condition_variable queue_changed;
 
-	std::unique_ptr<Mux> stream_mux;  // To HTTP.
-	std::string stream_mux_header;
+	AVFormatContext *avctx;
+	std::unique_ptr<Mux> mux;  // To HTTP, or to file.
+	std::string stream_mux_header;  // Only used in HTTP.
 	bool seen_sync_markers = false;
+	bool output_fast_forward;
 
 	std::unique_ptr<YCbCrConverter> ycbcr_converter;
 	std::unique_ptr<YCbCrConverter> ycbcr_semiplanar_converter;