Hand-apply bd7102b476c631b1fa9067f18ce938d86073f6c8; single-file hashes.

6 files changed, 70 insertions, 79 deletions

diff --git a/src/lib/encoded_data.cc b/src/lib/encoded_data.cc
index 0e8ffd6b5..4f8aaab4b 100644
--- a/src/lib/encoded_data.cc
+++ b/src/lib/encoded_data.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -91,15 +91,14 @@ EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
 }
 
 void
-EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, dcp::FrameInfo fin) const
+EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, dcp::FrameInfo info) const
 {
-	boost::filesystem::path const info = film->info_path (frame, eyes);
-	FILE* h = fopen_boost (info, "w");
-	if (!h) {
-		throw OpenFileError (info);
+	FILE* file = fopen_boost (film->info_file(), "ab");
+	if (!file) {
+		throw OpenFileError (film->info_file ());
 	}
-	fin.write (h);
-	fclose (h);
+	write_frame_info (file, frame, eyes, info);
+	fclose (file);
 }
 
 /** Send this data to a socket.
diff --git a/src/lib/film.cc b/src/lib/film.cc
index a7be8aea7..7dbeaafe9 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -207,14 +207,14 @@ Film::video_identifier () const
 	return s.str ();
 }
 	  
-/** @return The path to the directory to write video frame info files to */
+/** @return The file to write video frame info to */
 boost::filesystem::path
-Film::info_dir () const
+Film::info_file () const
 {
 	boost::filesystem::path p;
 	p /= "info";
 	p /= video_identifier ();
-	return dir (p);
+	return file (p);
 }
 
 boost::filesystem::path
@@ -316,25 +316,6 @@ Film::send_dcp_to_tms ()
 	JobManager::instance()->add (j);
 }
 
-/** Count the number of frames that have been encoded for this film.
- *  @return frame count.
- */
-int
-Film::encoded_frames () const
-{
-	if (container() == 0) {
-		return 0;
-	}
-
-	int N = 0;
-	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (info_dir ()); i != boost::filesystem::directory_iterator(); ++i) {
-		++N;
-		boost::this_thread::interruption_point ();
-	}
-
-	return N;
-}
-
 shared_ptr<xmlpp::Document>
 Film::metadata () const
 {
@@ -821,32 +802,6 @@ Film::set_isdcf_date_today ()
 }
 
 boost::filesystem::path
-Film::info_path (int f, Eyes e) const
-{
-	boost::filesystem::path p;
-	p /= info_dir ();
-
-	SafeStringStream s;
-	s.width (8);
-	s << setfill('0') << f;
-
-	if (e == EYES_LEFT) {
-		s << ".L";
-	} else if (e == EYES_RIGHT) {
-		s << ".R";
-	}
-
-	s << ".md5";
-	
-	p /= s.str();
-
-	/* info_dir() will already have added any initial bit of the path,
-	   so don't call file() on this.
-	*/
-	return p;
-}
-
-boost::filesystem::path
 Film::j2c_path (int f, Eyes e, bool t) const
 {
 	boost::filesystem::path p;
diff --git a/src/lib/film.h b/src/lib/film.h
index 3d1c02c93..cca31d306 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -61,9 +61,8 @@ public:
 	Film (boost::filesystem::path, bool log = true);
 	~Film ();
 
-	boost::filesystem::path info_dir () const;
+	boost::filesystem::path info_file () const;
 	boost::filesystem::path j2c_path (int, Eyes, bool) const;
-	boost::filesystem::path info_path (int, Eyes) const;
 	boost::filesystem::path internal_video_mxf_dir () const;
 	boost::filesystem::path internal_video_mxf_filename () const;
 	boost::filesystem::path audio_analysis_dir () const;
@@ -82,8 +81,6 @@ public:
 		return _log;
 	}
 
-	int encoded_frames () const;
-	
 	boost::filesystem::path file (boost::filesystem::path f) const;
 	boost::filesystem::path dir (boost::filesystem::path d) const;
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index ab991e76b..1c9968206 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -423,7 +423,7 @@ md5_digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t si
 		}
 
 		boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
-		fseek (f, -this_time, SEEK_END);
+		dcpomatic_fseek (f, -this_time, SEEK_END);
 		fread (p, 1, this_time, f);
 		p += this_time;
 		to_do -= this_time;
@@ -619,3 +619,47 @@ split_get_request (string url)
 
 	return r;
 }
+
+long
+frame_info_position (int frame, Eyes eyes)
+{
+	static int const info_size = 48;
+	
+	switch (eyes) {
+	case EYES_BOTH:
+		return frame * info_size;
+	case EYES_LEFT:
+		return frame * info_size * 2;
+	case EYES_RIGHT:
+		return frame * info_size * 2 + info_size;
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	DCPOMATIC_ASSERT (false);
+}
+
+dcp::FrameInfo
+read_frame_info (FILE* file, int frame, Eyes eyes)
+{
+	dcp::FrameInfo info;
+	dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
+	fread (&info.offset, sizeof (info.offset), 1, file);
+	fread (&info.size, sizeof (info.size), 1, file);
+	
+	char hash_buffer[33];
+	fread (hash_buffer, 1, 32, file);
+	hash_buffer[32] = '\0';
+	info.hash = hash_buffer;
+
+	return info;
+}
+
+void
+write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info)
+{
+	dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
+	fwrite (&info.offset, sizeof (info.offset), 1, file);
+	fwrite (&info.size, sizeof (info.size), 1, file);
+	fwrite (info.hash.c_str(), 1, info.hash.size(), file);
+}
diff --git a/src/lib/util.h b/src/lib/util.h
index 97e119389..bf1d0265b 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -29,6 +29,7 @@
 #include "exceptions.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
+#include <dcp/picture_mxf_writer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
@@ -75,6 +76,8 @@ extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);
 extern ContentTimePeriod subtitle_period (AVSubtitle const &);
 extern void set_backtrace_file (boost::filesystem::path);
+extern dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes);
+extern void write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info);
 extern int64_t video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second);
 extern std::map<std::string, std::string> split_get_request (std::string url);
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 909b1e448..e8a4ac10b 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -189,12 +189,12 @@ Writer::fake_write (int frame, Eyes eyes)
 		_full_condition.wait (lock);
 	}
 	
-	FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
-	if (!ifi) {
-		throw ReadFileError (_film->info_path (frame, eyes));
+	FILE* file = fopen_boost (_film->info_file (), "rb");
+	if (!file) {
+		throw ReadFileError (_film->info_file ());
 	}
-	dcp::FrameInfo info (ifi);
-	fclose (ifi);
+	dcp::FrameInfo info = read_frame_info (file, frame, eyes);
+	fclose (file);
 	
 	QueueItem qi;
 	qi.type = QueueItem::FAKE;
@@ -558,14 +558,14 @@ bool
 Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 {
 	/* Read the frame info as written */
-	FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r");
-	if (!ifi) {
+	FILE* file = fopen_boost (_film->info_file (), "rb");
+	if (!file) {
 		LOG_GENERAL ("Existing frame %1 has no info file", f);
 		return false;
 	}
 	
-	dcp::FrameInfo info (ifi);
-	fclose (ifi);
+	dcp::FrameInfo info = read_frame_info (file, f, eyes);
+	fclose (file);
 	if (info.size == 0) {
 		LOG_GENERAL ("Existing frame %1 has no info file", f);
 		return false;
@@ -603,19 +603,12 @@ Writer::check_existing_picture_mxf ()
 		return;
 	}
 
-	int N = 0;
-	for (boost::filesystem::directory_iterator i (_film->info_dir ()); i != boost::filesystem::directory_iterator (); ++i) {
-		++N;
-	}
-
 	while (true) {
 
 		shared_ptr<Job> job = _job.lock ();
 		DCPOMATIC_ASSERT (job);
 
-		if (N > 0) {
-			job->set_progress (float (_first_nonexistant_frame) / N);
-		}
+		job->set_progress_unknown ();
 
 		if (_film->three_d ()) {
 			if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {