X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsmpte_subtitle_asset.h;h=26144fe101be003e4e2c556e5a892afce0446ed9;hb=refs%2Fheads%2Ftidy-eq-options;hp=1ece2405c10952028648a4841c79d99915e1ea02;hpb=274dd30f2b11fe8ea563a2ac7436c9d463865b0b;p=libdcp.git

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 1ece2405..26144fe1 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -41,11 +41,12 @@
  */
 
 
-#include "subtitle_asset.h"
+#include "crypto_context.h"
 #include "language_tag.h"
 #include "local_time.h"
 #include "mxf.h"
-#include "crypto_context.h"
+#include "subtitle_asset.h"
+#include "subtitle_standard.h"
 #include <boost/filesystem.hpp>
 
 
@@ -58,6 +59,8 @@ namespace ASDCP {
 
 struct verify_invalid_language1;
 struct verify_invalid_language2;
+struct write_subtitles_in_vertical_order_with_top_alignment;
+struct write_subtitles_in_vertical_order_with_bottom_alignment;
 
 
 namespace dcp {
@@ -72,7 +75,7 @@ class SMPTELoadFontNode;
 class SMPTESubtitleAsset : public SubtitleAsset, public MXF
 {
 public:
-	SMPTESubtitleAsset ();
+	explicit SMPTESubtitleAsset(SubtitleStandard standard = SubtitleStandard::SMPTE_2014);
 
 	/** Construct a SMPTESubtitleAsset by reading an MXF or XML file
 	 *  @param file Filename
@@ -81,7 +84,7 @@ public:
 
 	bool equals (
 		std::shared_ptr<const Asset>,
-		EqualityOptions,
+		EqualityOptions const&,
 		NoteHandler note
 		) const override;
 
@@ -176,15 +179,22 @@ public:
 		return _start_time;
 	}
 
-	std::string xml_id () const {
+	/** @return ID from XML's <Id> tag, or the <Id> that will be used when writing the XML,
+	 *  or boost::none if this content is encrypted and no key is available.
+	 */
+	boost::optional<std::string> xml_id () const {
 		return _xml_id;
 	}
 
-	/** @return ResourceID read from the MXF, if there was one */
+	/** @return ResourceID read from any MXF that was read */
 	boost::optional<std::string> resource_id () const {
 		return _resource_id;
 	}
 
+	SubtitleStandard subtitle_standard() const override {
+		return _subtitle_standard;
+	}
+
 	static bool valid_mxf (boost::filesystem::path);
 	static std::string static_pkl_type (Standard) {
 		return "application/mxf";
@@ -201,10 +211,14 @@ private:
 	friend struct ::write_smpte_subtitle_test2;
 	friend struct ::verify_invalid_language1;
 	friend struct ::verify_invalid_language2;
+	friend struct ::write_subtitles_in_vertical_order_with_top_alignment;
+	friend struct ::write_subtitles_in_vertical_order_with_bottom_alignment;
 
 	void read_fonts (std::shared_ptr<ASDCP::TimedText::MXFReader>);
 	void parse_xml (std::shared_ptr<cxml::Document> xml);
-	void read_mxf_descriptor (std::shared_ptr<ASDCP::TimedText::MXFReader> reader, std::shared_ptr<DecryptionContext> dec);
+	void read_mxf_descriptor (std::shared_ptr<ASDCP::TimedText::MXFReader> reader);
+	void read_mxf_resources (std::shared_ptr<ASDCP::TimedText::MXFReader> reader, std::shared_ptr<DecryptionContext> dec);
+	std::string schema_namespace() const;
 
 	/** The total length of this content in video frames.  The amount of
 	 *  content presented may be less than this.
@@ -222,12 +236,19 @@ private:
 	Fraction _edit_rate;
 	int _time_code_rate = 0;
 	boost::optional<Time> _start_time;
+	/** There are two SMPTE standards describing subtitles, 428-7:2010 and 428-7:2014, and they
+	 *  have different interpretations of what Vposition means.  Though libdcp does not need to
+	 *  know the difference, this variable stores the standard from the namespace that this asset was
+	 *  written with (or will be written with).
+	 */
+	SubtitleStandard _subtitle_standard;
 
 	std::vector<std::shared_ptr<SMPTELoadFontNode>> _load_font_nodes;
 	/** UUID for the XML inside the MXF, which should be the same as the ResourceID in the MXF (our _resource_id)
 	 *  but different to the AssetUUID in the MXF (our _id) according to SMPTE Bv2.1 and Doremi's 2.8.18 release notes.
+	 *  May be boost::none if this object has been made from an encrypted object without a key.
 	 */
-	std::string _xml_id;
+	boost::optional<std::string> _xml_id;
 
 	/** ResourceID read from the MXF, if there was one */
 	boost::optional<std::string> _resource_id;