In FFmpegCapture, frame decoding into its own function.

[nageru] / ffmpeg_capture.h

diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h
index cde99c497fd596a4e7768dc51adce45ec1e3c6b6..619266de9e74921adf2e0e8565319ca1cba63ec0 100644 (file)
--- a/ffmpeg_capture.h
+++ b/ffmpeg_capture.h
@@ -31,6 +31,7 @@
 #include <movit/ycbcr.h>
 
 #include "bmusb/bmusb.h"
+#include "ffmpeg_raii.h"
 #include "quittable_sleeper.h"
 
 struct AVFormatContext;
@@ -155,6 +156,9 @@ private:
        // Returns true if there was an error.
        bool process_queued_commands(AVFormatContext *format_ctx, const std::string &pathname, timespec last_modified);
 
+       // 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);
+
        std::string description, filename;
        uint16_t timecode = 0;
        unsigned width, height;