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

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index 422b152..1b33587 100644
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -11,8 +11,8 @@ extern "C" {
 
 #include "frame_on_disk.h"
 #include "jpeg_frame_view.h"
-#include "shared/ref_counted_gl_sync.h"
 #include "queue_spot_holder.h"
+#include "shared/ref_counted_gl_sync.h"
 
 #include <atomic>
 #include <chrono>
@@ -47,28 +47,28 @@ public:
 	void schedule_original_frame(std::chrono::steady_clock::time_point,
 	                             int64_t output_pts, std::function<void()> &&display_func,
 	                             QueueSpotHolder &&queue_spot_holder,
-	                             FrameOnDisk frame);
+	                             FrameOnDisk frame, const std::string &subtitle);
 	void schedule_faded_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
 	                          std::function<void()> &&display_func,
 	                          QueueSpotHolder &&queue_spot_holder,
 	                          FrameOnDisk frame1, FrameOnDisk frame2,
-	                          float fade_alpha);
+	                          float fade_alpha, const std::string &subtitle);
 	void schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
-	                          std::function<void(std::shared_ptr<Frame>)> &&display_func,
-	                          QueueSpotHolder &&queue_spot_holder,
-	                          FrameOnDisk frame1, FrameOnDisk frame2,
-	                          float alpha, FrameOnDisk secondary_frame = {},  // Empty = no secondary (fade) frame.
-	                          float fade_alpha = 0.0f);
+	                                 std::function<void(std::shared_ptr<Frame>)> &&display_func,
+	                                 QueueSpotHolder &&queue_spot_holder,
+	                                 FrameOnDisk frame1, FrameOnDisk frame2,
+	                                 float alpha, FrameOnDisk secondary_frame,  // Empty = no secondary (fade) frame.
+	                                 float fade_alpha, const std::string &subtitle);
 	void schedule_refresh_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
 	                            std::function<void()> &&display_func,
-	                            QueueSpotHolder &&queue_spot_holder);
+	                            QueueSpotHolder &&queue_spot_holder, const std::string &subtitle);
 
 private:
 	FrameReader frame_reader;
 
 	void encode_thread_func();
 	std::thread encode_thread;
-	std::atomic<bool> should_quit{false};
+	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);
@@ -96,10 +96,10 @@ private:
 	static constexpr size_t num_interpolate_slots = 15;  // Should be larger than Player::max_queued_frames, or we risk mass-dropping frames.
 
 	struct IFRReleaser {
-		void operator() (InterpolatedFrameResources *ifr) const
+		void operator()(InterpolatedFrameResources *ifr) const
 		{
 			if (ifr != nullptr) {
-				std::unique_lock<std::mutex> lock(ifr->owner->queue_lock);
+				std::lock_guard<std::mutex> lock(ifr->owner->queue_lock);
 				ifr->owner->interpolate_resources.emplace_back(ifr);
 			}
 		}
@@ -111,7 +111,15 @@ private:
 
 		int64_t output_pts;
 		enum Type { ORIGINAL, FADED, INTERPOLATED, FADED_INTERPOLATED, REFRESH } type;
-		FrameOnDisk frame1;  // The only frame for original frames.
+
+		// For original frames only. Made move-only so we know explicitly
+		// we don't copy these ~200 kB files around inadvertedly.
+		//
+		// TODO: Consider using vector<uint8_t> instead, so we save one copy.
+		std::unique_ptr<std::string> encoded_jpeg;
+
+		// For everything except original frames.
+		FrameOnDisk frame1;
 
 		// For fades only (including fades against interpolated frames).
 		FrameOnDisk secondary_frame;
@@ -127,6 +135,8 @@ private:
 		std::function<void()> display_func;  // Called when the image is done decoding.
 		std::function<void(std::shared_ptr<Frame>)> display_decoded_func;  // Same, except for INTERPOLATED and FADED_INTERPOLATED.
 
+		std::string subtitle;  // Blank for none.
+
 		QueueSpotHolder queue_spot_holder;
 	};
 	std::deque<QueuedFrame> frame_queue;  // Under <queue_lock>.