Tidying.

[libdcp.git] / src / mxf.cc

diff --git a/src/mxf.cc b/src/mxf.cc
index 67e63283d93903323fa138cfb7520ed92055210f..1154b80df6fedad1001a5d704dbe89d168a2f976 100644 (file)
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -16,42 +16,77 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
-/** @file  src/asset.cc
- *  @brief Parent class for assets of DCPs made up of MXF files.
+
+/** @file  src/mxf.cc
+ *  @brief MXF class
  */
 
+
 #include "raw_convert.h"
-#include "AS_DCP.h"
-#include "KM_prng.h"
-#include "KM_util.h"
 #include "mxf.h"
 #include "util.h"
 #include "metadata.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
 
+
 using std::string;
 using std::cout;
 using std::list;
 using std::pair;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcp;
 
+
+MXF::MXF ()
+       : _context_id (make_uuid ())
+{
+       /* Subclasses can create MXFs with unspecified _standard but are expected to fill
+          _standard in once the MXF is read.
+       */
+}
+
+
+MXF::MXF (Standard standard)
+       : _context_id (make_uuid ())
+       , _standard (standard)
+{
+
+}
+
+
 void
-MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
+MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id) const
 {
        writer_info->ProductVersion = _metadata.product_version;
        writer_info->CompanyName = _metadata.company_name;
-       writer_info->ProductName = _metadata.product_name.c_str();
+       writer_info->ProductName = _metadata.product_name;
 
-       if (standard == INTEROP) {
+       DCP_ASSERT (_standard);
+       if (_standard == Standard::INTEROP) {
                writer_info->LabelSetType = ASDCP::LS_MXF_INTEROP;
        } else {
                writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
@@ -63,7 +98,7 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard stand
        writer_info->UsesHMAC = true;
 
        if (_key_id) {
-               Kumu::GenRandomUUID (writer_info->ContextID);
+               Kumu::hex2bin (_context_id.c_str(), writer_info->ContextID, Kumu::UUID_Length, &c);
                writer_info->EncryptedEssence = true;
 
                unsigned int c;
@@ -72,11 +107,7 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard stand
        }
 }
 
-/** Set the (private) key that will be used to encrypt or decrypt this MXF's content.
- *  This is the top-secret key that is distributed (itself encrypted) to cinemas
- *  via Key Delivery Messages (KDMs).
- *  @param key Key to use.
- */
+
 void
 MXF::set_key (Key key)
 {
@@ -88,6 +119,7 @@ MXF::set_key (Key key)
        }
 }
 
+
 string
 MXF::read_writer_info (ASDCP::WriterInfo const & info)
 {
@@ -98,6 +130,17 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
                _key_id = buffer;
        }
 
+       switch (info.LabelSetType) {
+       case ASDCP::LS_MXF_INTEROP:
+               _standard = Standard::INTEROP;
+               break;
+       case ASDCP::LS_MXF_SMPTE:
+               _standard = Standard::SMPTE;
+               break;
+       default:
+               throw ReadError ("Unrecognised label set type in MXF");
+       }
+
        _metadata.read (info);
 
        Kumu::bin2UUIDhex (info.AssetUUID, ASDCP::UUIDlen, buffer, sizeof (buffer));