Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / picture_asset.cc

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 625a0dd78394aa49d8d373583c46d248653b9088..68af0896b245a77101fa10a6eb80fcf1e049eb0b 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 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.
 */
 
 #include "picture_asset.h"
@@ -24,29 +38,24 @@
 #include "picture_asset_writer.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
-#include "AS_DCP.h"
-#include "KM_fileio.h"
+#include "j2k.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 #include <libxml++/nodes/element.h>
-#include <openjpeg.h>
 #include <boost/filesystem.hpp>
 #include <list>
 #include <stdexcept>
-#include <iostream>
-#include <sstream>
 
 using std::string;
-using std::ostream;
 using std::list;
 using std::vector;
 using std::max;
-using std::stringstream;
 using std::pair;
 using std::make_pair;
-using std::istream;
-using std::cout;
 using boost::shared_ptr;
 using namespace dcp;
 
+/** Load a PictureAsset from a file */
 PictureAsset::PictureAsset (boost::filesystem::path file)
        : Asset (file)
        , _intrinsic_duration (0)
@@ -54,8 +63,10 @@ PictureAsset::PictureAsset (boost::filesystem::path file)
 
 }
 
-PictureAsset::PictureAsset (Fraction edit_rate)
-       : _edit_rate (edit_rate)
+/** Create a new PictureAsset with a given edit rate and standard */
+PictureAsset::PictureAsset (Fraction edit_rate, Standard standard)
+       : MXF (standard)
+       , _edit_rate (edit_rate)
        , _intrinsic_duration (0)
 {
 
@@ -165,7 +176,7 @@ PictureAsset::frame_buffer_equals (
 
        double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
 
-       note (DCP_NOTE, String::compose ("mean difference %1, deviation %2", mean, std_dev));
+       note (DCP_NOTE, String::compose ("mean difference %1 deviation %2", mean, std_dev));
 
        if (mean > opt.max_mean_pixel_error) {
                note (
@@ -189,7 +200,7 @@ PictureAsset::frame_buffer_equals (
 }
 
 string
-PictureAsset::pkl_type (Standard standard) const
+PictureAsset::static_pkl_type (Standard standard)
 {
        switch (standard) {
        case INTEROP:
@@ -200,3 +211,9 @@ PictureAsset::pkl_type (Standard standard) const
                DCP_ASSERT (false);
        }
 }
+
+string
+PictureAsset::pkl_type (Standard standard) const
+{
+       return static_pkl_type (standard);
+}