X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.h;h=422b1522a28a993d056d5eea2344a05ce13243c6;hb=94a228f7473325130704e96c82937b690703615b;hp=736a20fe275ca7acacf9bd6be1e79377877840ac;hpb=6e116a6bbeb2c047a3bfb084395ec601ce211e6c;p=nageru

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index 736a20f..422b152 100644
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -5,14 +5,16 @@
 #include <stdint.h>
 
 extern "C" {
+#include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 }
 
 #include "frame_on_disk.h"
 #include "jpeg_frame_view.h"
-#include "ref_counted_gl_sync.h"
+#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);
@@ -118,7 +121,7 @@ private:
 		float alpha;
 		BorrowedInterpolatedFrameResources resources;
 		RefCountedGLsync fence;  // Set when the interpolated image is read back to the CPU.
-		GLuint flow_tex, output_tex, cbcr_tex;  // Released in the receiving thread; not really used for anything else.
+		GLuint flow_tex, output_tex, cbcr_tex;  // Released in the receiving thread; not really used for anything else. flow_tex will typically even be from a previous frame.
 		FrameOnDisk id;
 
 		std::function<void()> display_func;  // Called when the image is done decoding.
@@ -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;
@@ -141,6 +146,10 @@ private:
 	std::unique_ptr<Interpolate> interpolate, interpolate_no_split;
 	std::unique_ptr<ChromaSubsampler> chroma_subsampler;
 
+	// Cached flow computation from previous frame, if any.
+	GLuint last_flow_tex = 0;
+	FrameOnDisk last_frame1, last_frame2;
+
 	std::vector<uint8_t> last_frame;
 };