X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.h;h=85e436e65ac9668511db42da92bb6a33d3558c51;hb=35efc9e3149028e6c65dceb46f60490448dcbd9f;hp=cde99c497fd596a4e7768dc51adce45ec1e3c6b6;hpb=0f5a145f0cd11cb043e1cefc6bf6187bdac31bbd;p=nageru

diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h
index cde99c4..85e436e 100644
--- a/ffmpeg_capture.h
+++ b/ffmpeg_capture.h
@@ -30,10 +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
 {
@@ -55,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.
@@ -121,7 +131,7 @@ public:
 	void stop_dequeue_thread() override;
 	bool get_disconnected() const override { return false; }  // We never unplug.
 
-	std::map<uint32_t, bmusb::VideoMode> get_available_video_modes() const;
+	std::map<uint32_t, bmusb::VideoMode> get_available_video_modes() const override;
 	void set_video_mode(uint32_t video_mode_id) override {}  // Ignore.
 	uint32_t get_current_video_mode() const override { return 0; }
 
@@ -153,7 +163,13 @@ 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;
@@ -174,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;