X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=58223fa97d82cf94593d0aff6339733a0261376b;hb=62f9b78a2eb5f0fc6b9028264bac6ad501d83309;hp=43efcf74f456fd031cb900aab1ae3c5d58c65238;hpb=0914bfdbfc498d99821c2cd0ca3a4f9a184d07b5;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 43efcf74f..58223fa97 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -1,33 +1,39 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
+
 #include "file_group.h"
 #include "ffmpeg_subtitle_period.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread/mutex.hpp>
 
+
 struct AVFormatContext;
 struct AVFrame;
 struct AVIOContext;
@@ -36,13 +42,14 @@ class FFmpegContent;
 class FFmpegAudioStream;
 class Log;
 
+
 class FFmpeg
 {
 public:
-	FFmpeg (boost::shared_ptr<const FFmpegContent>);
+	explicit FFmpeg (std::shared_ptr<const FFmpegContent>);
 	virtual ~FFmpeg ();
 
-	boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
+	std::shared_ptr<const FFmpegContent> ffmpeg_content () const {
 		return _ffmpeg_content;
 	}
 
@@ -52,27 +59,25 @@ public:
 protected:
 	AVCodecContext* video_codec_context () const;
 	AVCodecContext* subtitle_codec_context () const;
-	ContentTime pts_offset (
-		std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
+	dcpomatic::ContentTime pts_offset (
+		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 std::string subtitle_id (AVSubtitle const & sub);
-	static bool subtitle_starts_image (AVSubtitle const & sub);
 
-	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
+	std::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
-	uint8_t* _avio_buffer;
-	int _avio_buffer_size;
-	AVIOContext* _avio_context;
+	uint8_t* _avio_buffer = nullptr;
+	int _avio_buffer_size = 4096;
+	AVIOContext* _avio_context = nullptr;
 	FileGroup _file_group;
 
-	AVFormatContext* _format_context;
-	AVPacket _packet;
-	AVFrame* _frame;
+	AVFormatContext* _format_context = nullptr;
+	std::vector<AVCodecContext*> _codec_context;
+	AVFrame* _frame = nullptr;
 
 	/** Index of video stream within AVFormatContext */
-	int _video_stream;
+	boost::optional<int> _video_stream;
 
 	/* It would appear (though not completely verified) that one must have
 	   a mutex around calls to avcodec_open* and avcodec_close... and here
@@ -85,7 +90,8 @@ private:
 	void setup_decoders ();
 
 	static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
-	static boost::weak_ptr<Log> _ffmpeg_log;
+	static std::weak_ptr<Log> _ffmpeg_log;
 };
 
+
 #endif