X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_asset.cc;h=59af7c7299c6c9eb68701118aa7c340865c85c82;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=27d879498c055c5b820a4e80c8ee299b65a393a5;hpb=aeaa2d842b3b8422ac341c43652d083cacf3aee7;p=libdcp.git

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 27d87949..59af7c72 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -1,24 +1,39 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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 "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
+#include "mono_picture_asset_reader.h"
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "exceptions.h"
@@ -64,12 +79,6 @@ MonoPictureAsset::MonoPictureAsset (Fraction edit_rate)
 
 }
 
-shared_ptr<const MonoPictureFrame>
-MonoPictureAsset::get_frame (int n) const
-{
-	return shared_ptr<const MonoPictureFrame> (new MonoPictureFrame (_file, n, _decryption_context));
-}
-
 static void
 storing_note_handler (list<pair<NoteType, string> >& notes, NoteType t, string s)
 {
@@ -113,7 +122,13 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
 
 	bool result = true;
 
+#ifdef LIBDCP_OPENMP
 #pragma omp parallel for
+#endif
+
+	shared_ptr<MonoPictureAssetReader> reader = start_read ();
+	shared_ptr<MonoPictureAssetReader> other_reader = other_picture->start_read ();
+
 	for (int i = 0; i < _intrinsic_duration; ++i) {
 		if (i >= other_picture->intrinsic_duration()) {
 			result = false;
@@ -121,25 +136,27 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
 
 		if (result || opt.keep_going) {
 
-#pragma omp critical
-			note (DCP_PROGRESS, String::compose ("Comparing video frame %1 of %2", i, _intrinsic_duration));
-
-			shared_ptr<const MonoPictureFrame> frame_A = get_frame (i);
-			shared_ptr<const MonoPictureFrame> frame_B = other_picture->get_frame (i);
+			shared_ptr<const MonoPictureFrame> frame_A = reader->get_frame (i);
+			shared_ptr<const MonoPictureFrame> frame_B = other_reader->get_frame (i);
 
 			list<pair<NoteType, string> > notes;
 
 			if (!frame_buffer_equals (
-				    i, opt, bind (&storing_note_handler, notes, _1, _2),
+				    i, opt, bind (&storing_note_handler, boost::ref(notes), _1, _2),
 				    frame_A->j2k_data(), frame_A->j2k_size(),
 				    frame_B->j2k_data(), frame_B->j2k_size()
 				    )) {
 				result = false;
 			}
 
+#ifdef LIBDCP_OPENMP
 #pragma omp critical
-			for (list<pair<NoteType, string> >::const_iterator i = notes.begin(); i != notes.end(); ++i) {
-				note (i->first, i->second);
+#endif
+			{
+				note (DCP_PROGRESS, String::compose ("Compared video frame %1 of %2", i, _intrinsic_duration));
+				for (list<pair<NoteType, string> >::const_iterator i = notes.begin(); i != notes.end(); ++i) {
+					note (i->first, i->second);
+				}
 			}
 		}
 	}
@@ -154,6 +171,12 @@ MonoPictureAsset::start_write (boost::filesystem::path file, Standard standard,
 	return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, standard, overwrite));
 }
 
+shared_ptr<MonoPictureAssetReader>
+MonoPictureAsset::start_read () const
+{
+	return shared_ptr<MonoPictureAssetReader> (new MonoPictureAssetReader (this));
+}
+
 string
 MonoPictureAsset::cpl_node_name () const
 {