X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=55357d24b6a7d537770000e74ca8f3865a583362;hb=0a4c399e8ed2ebb8b7dadf2684595effd1ca9f3e;hp=58223fa97d82cf94593d0aff6339733a0261376b;hpb=1516214cdc7970797b79bca06b46a2eed16a1da3;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 58223fa97..55357d24b 100644
--- 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;
 
@@ -74,11 +75,14 @@ protected:
 
 	AVFormatContext* _format_context = nullptr;
 	std::vector<AVCodecContext*> _codec_context;
-	AVFrame* _frame = nullptr;
 
+	/** 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,7 +94,9 @@ private:
 	void setup_decoders ();
 
 	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;
 };