X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.h;h=705d25ffe5a47461e297401e81e7c6ccd6b69eaf;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=85e436e65ac9668511db42da92bb6a33d3558c51;hpb=7e935df0181c5aee5e5195a1925b09528d461151;p=nageru diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h index 85e436e..705d25f 100644 --- a/ffmpeg_capture.h +++ b/ffmpeg_capture.h @@ -16,7 +16,8 @@ // but it would require some more plumbing, and it would also fail if the file // changes parameters midway, which is allowed in some formats. // -// There is currently no audio support. +// You can get out the audio either as decoded or in raw form (Kaeru uses this). +// However, the rest of Nageru can't really use the audio for anything yet. #include #include @@ -31,17 +32,21 @@ #include extern "C" { +#include #include #include +#include } #include "bmusb/bmusb.h" #include "ffmpeg_raii.h" +#include "ref_counted_frame.h" #include "quittable_sleeper.h" struct AVFormatContext; struct AVFrame; struct AVRational; +struct AVPacket; class FFmpegCapture : public bmusb::CaptureInterface { @@ -73,6 +78,12 @@ public: producer_thread_should_quit.wakeup(); } + // Will stop the stream even if it's hung on blocking I/O. + void disconnect() + { + should_interrupt = true; + } + // CaptureInterface. void set_video_frame_allocator(bmusb::FrameAllocator *allocator) override { @@ -101,11 +112,38 @@ public: return audio_frame_allocator; } - void set_frame_callback(bmusb::frame_callback_t callback) override + // FFmpegCapture-specific overload of set_frame_callback that also gives + // the raw original pts from the video. Negative pts means a dummy frame. + typedef std::function + frame_callback_t; + void set_frame_callback(frame_callback_t callback) { frame_callback = callback; } + void set_frame_callback(bmusb::frame_callback_t callback) override + { + frame_callback = std::bind( + callback, + std::placeholders::_5, + std::placeholders::_6, + std::placeholders::_7, + std::placeholders::_8, + std::placeholders::_9, + std::placeholders::_10, + std::placeholders::_11); + } + + // FFmpegCapture-specific callback that gives the raw audio. + typedef std::function audio_callback_t; + void set_audio_callback(audio_callback_t callback) + { + audio_callback = callback; + } + // Used to get precise information about the Y'CbCr format used // for a given frame. Only valid to call during the frame callback, // and only when receiving a frame with pixel format PixelFormat_8BitYCbCrPlanar. @@ -135,8 +173,9 @@ public: void set_video_mode(uint32_t video_mode_id) override {} // Ignore. uint32_t get_current_video_mode() const override { return 0; } + static constexpr bmusb::PixelFormat PixelFormat_NV12 = static_cast(100); // In the private range. std::set get_available_pixel_formats() const override { - return std::set{ bmusb::PixelFormat_8BitBGRA, bmusb::PixelFormat_8BitYCbCrPlanar }; + return std::set{ bmusb::PixelFormat_8BitBGRA, bmusb::PixelFormat_8BitYCbCrPlanar, PixelFormat_NV12 }; } void set_pixel_format(bmusb::PixelFormat pixel_format) override { this->pixel_format = pixel_format; @@ -166,10 +205,16 @@ private: 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); + 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, + 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); 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); + UniqueFrame make_video_frame(const AVFrame *frame, const std::string &pathname, bool *error); + + static int interrupt_cb_thunk(void *unique); + int interrupt_cb(); std::string description, filename; uint16_t timecode = 0; @@ -179,6 +224,7 @@ private: bool running = false; int card_index = -1; double rate = 1.0; + std::atomic should_interrupt{false}; bool has_dequeue_callbacks = false; std::function dequeue_init_callback = nullptr; @@ -188,12 +234,13 @@ private: bmusb::FrameAllocator *audio_frame_allocator = nullptr; std::unique_ptr owned_video_frame_allocator; std::unique_ptr owned_audio_frame_allocator; - bmusb::frame_callback_t frame_callback = nullptr; + frame_callback_t frame_callback = nullptr; + audio_callback_t audio_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; + AVRational video_timebase, audio_timebase; QuittableSleeper producer_thread_should_quit; std::thread producer_thread; @@ -207,6 +254,13 @@ private: double new_rate; // For CHANGE_RATE. }; std::vector command_queue; // Protected by . + + // Audio resampler. + AVAudioResampleContext *resampler = nullptr; + AVSampleFormat last_src_format, last_dst_format; + int64_t last_channel_layout; + int last_sample_rate; + }; #endif // !defined(_FFMPEG_CAPTURE_H)