X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=9ffb8421b0ec91c826701b37751d685413c8740b;hb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;hp=67fdcfae0baa65986a407f2adfd2b237828875da;hpb=383c3b6c81e916c59b08a765540784d3f2350276;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 67fdcfae0..9ffb8421b 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -49,10 +49,12 @@ public:
 		return _audio_streams;
 	}
 
-	boost::optional<ContentTime> first_video () const {
+	boost::optional<dcpomatic::ContentTime> first_video () const {
 		return _first_video;
 	}
 
+	VideoRange range () const;
+
 	AVColorRange color_range () const {
 		return video_codec_context()->color_range;
 	}
@@ -75,17 +77,23 @@ public:
 		return _rotation;
 	}
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::optional<std::string> id () const {
+		return _id;
+	}
+#endif
+
 private:
 	void video_packet (AVCodecContext *);
 	void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
 
 	std::string stream_name (AVStream* s) const;
 	std::string subtitle_stream_name (AVStream* s) const;
-	boost::optional<ContentTime> frame_time (AVStream* s) const;
+	boost::optional<dcpomatic::ContentTime> frame_time (AVStream* s) const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-	boost::optional<ContentTime> _first_video;
+	boost::optional<dcpomatic::ContentTime> _first_video;
 	/** Video length, either obtained from the header or derived by running
 	 *  through the whole file.
 	 */
@@ -94,9 +102,13 @@ private:
 
 	boost::optional<double> _rotation;
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::optional<std::string> _id;
+#endif
+
 	struct SubtitleStart
 	{
-		SubtitleStart (std::string id_, bool image_, ContentTime time_)
+		SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)
 			: id (id_)
 			, image (image_)
 			, time (time_)
@@ -105,7 +117,7 @@ private:
 		std::string id;
 		/** true if it's an image subtitle, false for text */
 		bool image;
-		ContentTime time;
+		dcpomatic::ContentTime time;
 	};
 
 	typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;