X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.h;h=328685b30208ef9416a7e97047fe23137e57533b;hb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;hp=619266de9e74921adf2e0e8565319ca1cba63ec0;hpb=135963becbab6b243527e283b38f1b67e8ecdcf6;p=nageru

diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h
index 619266d..328685b 100644
--- a/ffmpeg_capture.h
+++ b/ffmpeg_capture.h
@@ -30,11 +30,18 @@
 
 #include <movit/ycbcr.h>
 
+extern "C" {
+#include <libavutil/pixfmt.h>
+#include <libavutil/rational.h>
+}
+
 #include "bmusb/bmusb.h"
 #include "ffmpeg_raii.h"
 #include "quittable_sleeper.h"
 
 struct AVFormatContext;
+struct AVFrame;
+struct AVRational;
 
 class FFmpegCapture : public bmusb::CaptureInterface
 {
@@ -56,12 +63,14 @@ public:
 	{
 		std::lock_guard<std::mutex> lock(queue_mu);
 		command_queue.push_back(QueuedCommand { QueuedCommand::REWIND });
+		producer_thread_should_quit.wakeup();
 	}
 
 	void change_rate(double new_rate)
 	{
 		std::lock_guard<std::mutex> lock(queue_mu);
 		command_queue.push_back(QueuedCommand { QueuedCommand::CHANGE_RATE, new_rate });
+		producer_thread_should_quit.wakeup();
 	}
 
 	// CaptureInterface.
@@ -154,11 +163,14 @@ private:
 	void internal_rewind();
 
 	// Returns true if there was an error.
-	bool process_queued_commands(AVFormatContext *format_ctx, const std::string &pathname, timespec last_modified);
+	bool process_queued_commands(AVFormatContext *format_ctx, const std::string &pathname, timespec last_modified, bool *rewound);
 
 	// Returns nullptr if no frame was decoded (e.g. EOF).
 	AVFrameWithDeleter decode_frame(AVFormatContext *format_ctx, AVCodecContext *codec_ctx, const std::string &pathname, int video_stream_index, bool *error);
 
+	bmusb::VideoFormat construct_video_format(const AVFrame *frame, AVRational video_timebase);
+	bmusb::FrameAllocator::Frame make_video_frame(const AVFrame *frame, const std::string &pathname, bool *error);
+
 	std::string description, filename;
 	uint16_t timecode = 0;
 	unsigned width, height;
@@ -178,6 +190,11 @@ private:
 	std::unique_ptr<bmusb::FrameAllocator> owned_audio_frame_allocator;
 	bmusb::frame_callback_t frame_callback = nullptr;
 
+	SwsContextWithDeleter sws_ctx;
+	int sws_last_width = -1, sws_last_height = -1, sws_last_src_format = -1;
+	AVPixelFormat sws_dst_format = AVPixelFormat(-1);  // In practice, always initialized.
+	AVRational video_timebase;
+
 	QuittableSleeper producer_thread_should_quit;
 	std::thread producer_thread;