X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fffmpeg_capture.h;h=843c83c254d4b9b5ac8cf46532c236cc269298c7;hb=f9024d141398e69e7b4011becd3ebbe37eaa1776;hp=468c213d17f677a9235242a5d9f7b1bcecdeaba3;hpb=1501c53153cb0daa846e4de7a73cfbfc797fd543;p=nageru

diff --git a/nageru/ffmpeg_capture.h b/nageru/ffmpeg_capture.h
index 468c213..843c83c 100644
--- a/nageru/ffmpeg_capture.h
+++ b/nageru/ffmpeg_capture.h
@@ -17,6 +17,11 @@
 // changes parameters midway, which is allowed in some formats.
 //
 // You can get out the audio either as decoded or in raw form (Kaeru uses this).
+//
+// If there's a subtitle track, you can also get out the last subtitle at the
+// point of the frame. Note that once we get a video frame, we don't look for
+// subtitle, so if subtitles and a frame comes at the same time, you might not
+// see the subtitle until the next frame.
 
 #include <assert.h>
 #include <stdint.h>
@@ -28,6 +33,7 @@
 #include <string>
 #include <thread>
 
+#include <movit/effect.h>
 #include <movit/ycbcr.h>
 
 extern "C" {
@@ -164,6 +170,24 @@ public:
 		return current_frame_ycbcr_format;
 	}
 
+	// Only valid to call during the frame callback.
+	std::string get_last_subtitle() const
+	{
+		return last_subtitle;
+	}
+
+	// Same.
+	bool get_has_last_subtitle() const
+	{
+		return has_last_subtitle;
+	}
+
+	// Same.
+	movit::RGBTriplet get_last_neutral_color() const
+	{
+		return last_neutral_color;
+	}
+
 	void set_dequeue_thread_callbacks(std::function<void()> init, std::function<void()> cleanup) override
 	{
 		dequeue_init_callback = init;
@@ -218,7 +242,7 @@ private:
 
 	// Returns nullptr if no frame was decoded (e.g. EOF).
 	AVFrameWithDeleter decode_frame(AVFormatContext *format_ctx, AVCodecContext *video_codec_ctx, AVCodecContext *audio_codec_ctx,
-	                                const std::string &pathname, int video_stream_index, int audio_stream_index,
+	                                const std::string &pathname, int video_stream_index, int audio_stream_index, int subtitle_stream_index,
 	                                bmusb::FrameAllocator::Frame *audio_frame, bmusb::AudioFormat *audio_format, int64_t *audio_pts, bool *error);
 	void convert_audio(const AVFrame *audio_avframe, bmusb::FrameAllocator::Frame *audio_frame, bmusb::AudioFormat *audio_format);
 
@@ -237,6 +261,7 @@ private:
 	bool running = false;
 	int card_index = -1;
 	double rate = 1.0;
+	bool play_as_fast_as_possible = false;  // Activated iff rate >= 10.0.
 	std::atomic<bool> should_interrupt{false};
 	bool last_frame_was_connected = true;
 
@@ -276,6 +301,11 @@ private:
 	int64_t last_channel_layout;
 	int last_sample_rate;
 
+	// Subtitles (no decoding done, really).
+	bool has_last_subtitle = false;
+	std::string last_subtitle;
+
+	movit::RGBTriplet last_neutral_color{1.0f, 1.0f, 1.0f};
 };
 
 #endif  // !defined(_FFMPEG_CAPTURE_H)