Port FFmpegCapture to the AVChannelLayout API.

[nageru] / nageru / ffmpeg_capture.h

diff --git a/nageru/ffmpeg_capture.h b/nageru/ffmpeg_capture.h
index 1fc8f7128f516d6b4d06431b3049256f7bbdf7f7..fc584827a373e791ae85123a3a58de3d553b72c7 100644 (file)
--- a/nageru/ffmpeg_capture.h
+++ b/nageru/ffmpeg_capture.h
@@ -38,6 +38,7 @@
 
 extern "C" {
 #include <libswresample/swresample.h>
+#include <libavutil/channel_layout.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
@@ -159,9 +160,13 @@ public:
                        std::placeholders::_11);
        }
 
-       // FFmpegCapture-specific callback that gives the raw audio.
-       typedef std::function<void(const AVPacket *pkt, const AVRational timebase)> audio_callback_t;
-       void set_audio_callback(audio_callback_t callback)
+       // FFmpegCapture-specific callback that gives the raw audio/video.
+       typedef std::function<void(const AVPacket *pkt, const AVRational timebase)> packet_callback_t;
+       void set_video_callback(packet_callback_t callback)
+       {
+               video_callback = callback;
+       }
+       void set_audio_callback(packet_callback_t callback)
        {
                audio_callback = callback;
        }
@@ -284,6 +289,10 @@ private:
        std::atomic<bool> should_interrupt{false};
        bool last_frame_was_connected = true;
 
+       // TODO: Replace with std::optional if we go C++17.
+       bool frame_timeout_valid = false;  // If true, will time out any reads after ten seconds.
+       std::chrono::steady_clock::time_point frame_timeout_started;  // Only relevant if frame_timeout_valid == true.
+
        bool has_dequeue_callbacks = false;
        std::function<void()> dequeue_init_callback = nullptr;
        std::function<void()> dequeue_cleanup_callback = nullptr;
@@ -297,7 +306,8 @@ private:
        std::unique_ptr<bmusb::FrameAllocator> owned_video_frame_allocator;
        std::unique_ptr<bmusb::FrameAllocator> owned_audio_frame_allocator;
        frame_callback_t frame_callback = nullptr;
-       audio_callback_t audio_callback = nullptr;
+       packet_callback_t video_callback = nullptr;
+       packet_callback_t audio_callback = nullptr;
 
        SwsContextWithDeleter sws_ctx;
        int sws_last_width = -1, sws_last_height = -1, sws_last_src_format = -1;
@@ -321,7 +331,7 @@ private:
        // Audio resampler.
        SwrContext *resampler = nullptr;
        AVSampleFormat last_src_format, last_dst_format;
-       int64_t last_channel_layout;
+       AVChannelLayout last_channel_layout;
        int last_sample_rate;
 
        // Subtitles (no decoding done, really).