X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=f338723b73b2a8968cdfcf7196ff6c101554b972;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=f5ee95acfe82e10a956df807186646d6fcbf317a;hpb=937240f9e360e434b36c418656ae6fe8cc6afea9;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index f5ee95acf..f338723b7 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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/>.
 
 */
 
@@ -21,20 +22,24 @@
 #include "video_examiner.h"
 #include <boost/optional.hpp>
 
-class AVStream;
+struct AVStream;
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
+class Job;
 
 class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
 	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
 
-	boost::optional<float> video_frame_rate () const;
+	bool has_video () const;
+
+	boost::optional<double> video_frame_rate () const;
 	dcp::Size video_size () const;
 	Frame video_length () const;
-	boost::optional<float> sample_aspect_ratio () const;
+	boost::optional<double> sample_aspect_ratio () const;
+	bool yuv () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
@@ -64,6 +69,8 @@ public:
 		return video_codec_context()->colorspace;
 	}
 
+	int bits_per_pixel () const;
+
 private:
 	void video_packet (AVCodecContext *);
 	void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
@@ -83,5 +90,20 @@ private:
 	Frame _video_length;
 	bool _need_video_length;
 
-	boost::optional<ContentTime> _last_subtitle_start;
+	struct SubtitleStart
+	{
+		SubtitleStart (std::string id_, bool image_, ContentTime time_)
+			: id (id_)
+			, image (image_)
+			, time (time_)
+		{}
+
+		std::string id;
+		/** true if it's an image subtitle, false for text */
+		bool image;
+		ContentTime time;
+	};
+
+	typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;
+	LastSubtitleMap _last_subtitle_start;
 };