X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=5437c5bf35f04450ca9b2aeeabecb81044a7273a;hp=da8152c0d92816de44a576f718a15f9f94c5db24;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=6de35d058821acc092d2aae75543024a97026b8a

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index da8152c0d..5437c5bf3 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,12 +20,9 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
-#include "audio_mapping.h"
 
 struct AVFormatContext;
 struct AVStream;
@@ -34,14 +31,13 @@ class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
 struct ffmpeg_pts_offset_test;
+struct audio_sampling_rate_test;
 
 class FFmpegContentProperty : public VideoContentProperty
 {
 public:
 	static int const SUBTITLE_STREAMS;
 	static int const SUBTITLE_STREAM;
-	static int const AUDIO_STREAMS;
-	static int const AUDIO_STREAM;
 	static int const FILTERS;
 };
 
@@ -55,29 +51,30 @@ public:
 	boost::shared_ptr<FFmpegContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
 	}
-	
+
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	DCPTime full_length () const;
 
 	std::string identifier () const;
-	
+
+	/* VideoContent */
+	void set_default_colour_conversion ();
+
 	/* AudioContent */
-	int audio_channels () const;
-	ContentTime audio_length () const;
-	int audio_frame_rate () const;
-	AudioMapping audio_mapping () const;
-	void set_audio_mapping (AudioMapping);
-	boost::filesystem::path audio_analysis_path () const;
+	std::vector<AudioStreamPtr> audio_streams () const;
 
 	/* SubtitleContent */
-	bool has_subtitles () const;
+	bool has_text_subtitles () const;
+	bool has_image_subtitles () const;
+	double subtitle_video_frame_rate () const {
+		return video_frame_rate ();
+	}
 
 	void set_filters (std::vector<Filter const *> const &);
-	
+
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _subtitle_streams;
@@ -88,15 +85,10 @@ public:
 		return _subtitle_stream;
 	}
 
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_streams;
 	}
-	
-	boost::shared_ptr<FFmpegAudioStream> audio_stream () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_stream;
-	}
 
 	std::vector<Filter const *> filters () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -104,7 +96,6 @@ public:
 	}
 
 	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
-	void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
 
 	boost::optional<ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -113,16 +104,25 @@ public:
 
 	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
 
+protected:
+	void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+
 private:
 	friend struct ffmpeg_pts_offset_test;
-	
+	friend struct audio_sampling_rate_test;
+
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-	boost::shared_ptr<FFmpegAudioStream> _audio_stream;
 	boost::optional<ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
+
+	AVColorRange _color_range;
+	AVColorPrimaries _color_primaries;
+	AVColorTransferCharacteristic _color_trc;
+	AVColorSpace _colorspace;
+	boost::optional<int> _bits_per_pixel;
 };
 
 #endif