Basic release notes support (#2282).

[dcpomatic.git] / src / lib / ffmpeg.h

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 5e1d0842ec771e6cccd803f4acf31442ae508006..25d26e8136ad5a5d5b7cb28ee4012e1a87a8e228 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -25,17 +25,18 @@
 
 #include "file_group.h"
 #include "ffmpeg_subtitle_period.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/mutex.hpp>
 
 
 struct AVFormatContext;
 struct AVFrame;
+struct AVStream;
 struct AVIOContext;
 
 class FFmpegContent;
@@ -63,7 +64,7 @@ protected:
                std::vector<std::shared_ptr<FFmpegAudioStream>> audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
                ) const;
 
-       static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
+       static FFmpegSubtitlePeriod subtitle_period (AVPacket const* packet, AVStream const* stream, AVSubtitle const & sub);
 
        std::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
@@ -73,11 +74,15 @@ protected:
        FileGroup _file_group;
 
        AVFormatContext* _format_context = nullptr;
-       AVFrame* _frame = nullptr;
+       std::vector<AVCodecContext*> _codec_context;
 
+       /** AVFrame used for decoding video */
+       AVFrame* _video_frame = nullptr;
        /** Index of video stream within AVFormatContext */
        boost::optional<int> _video_stream;
 
+       AVFrame* audio_frame (std::shared_ptr<const FFmpegAudioStream> stream);
+
        /* It would appear (though not completely verified) that one must have
           a mutex around calls to avcodec_open* and avcodec_close... and here
           it is.
@@ -90,6 +95,9 @@ private:
 
        static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
        static std::weak_ptr<Log> _ffmpeg_log;
+
+       /** AVFrames used for decoding audio streams; accessed with audio_frame() */
+       std::map<std::shared_ptr<const FFmpegAudioStream>, AVFrame*> _audio_frame;
 };