X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=a50aad81758afc218dab6e38bfed68e431ae909a;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=a20a44e77c25fc194d95bec4f393972731465748;hpb=8e269447379c7191d55b895bd8149578a681f659;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a20a44e77..a50aad817 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -28,21 +28,28 @@
 #include "job_manager.h"
 #include "transcode_job.h"
 #include "upload_job.h"
-#include "log.h"
+#include "null_log.h"
+#include "file_log.h"
 #include "exceptions.h"
 #include "examine_content_job.h"
 #include "config.h"
 #include "playlist.h"
-#include "player.h"
 #include "dcp_content_type.h"
 #include "ratio.h"
 #include "cross.h"
-#include "cinema.h"
 #include "safe_stringstream.h"
 #include "environment_info.h"
 #include "raw_convert.h"
 #include "audio_processor.h"
 #include "md5_digester.h"
+#include "compose.hpp"
+#include "screen.h"
+#include "audio_content.h"
+#include "video_content.h"
+#include "subtitle_content.h"
+#include "ffmpeg_content.h"
+#include "dcp_content.h"
+#include "screen_kdm.h"
 #include <libcxml/cxml.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
@@ -52,13 +59,11 @@
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
 #include <unistd.h>
 #include <stdexcept>
 #include <iostream>
 #include <algorithm>
-#include <fstream>
 #include <cstdlib>
 #include <iomanip>
 #include <set>
@@ -66,31 +71,23 @@
 #include "i18n.h"
 
 using std::string;
-using std::multimap;
 using std::pair;
-using std::map;
 using std::vector;
 using std::setfill;
 using std::min;
 using std::max;
 using std::make_pair;
-using std::endl;
 using std::cout;
 using std::list;
 using std::set;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
-using boost::to_upper_copy;
-using boost::ends_with;
-using boost::starts_with;
 using boost::optional;
 using boost::is_any_of;
-using dcp::Size;
-using dcp::CertificateChain;
 
-#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
 
 /* 5 -> 6
  * AudioMapping XML changed.
@@ -127,7 +124,7 @@ Film::Film (boost::filesystem::path dir, bool log)
 	, _audio_channels (6)
 	, _three_d (false)
 	, _sequence_video (true)
-	, _interop (false)
+	, _interop (Config::instance()->default_interop ())
 	, _audio_processor (0)
 	, _state_version (current_state_version)
 	, _dirty (false)
@@ -167,8 +164,12 @@ Film::Film (boost::filesystem::path dir, bool log)
 
 Film::~Film ()
 {
-	for (list<boost::signals2::connection>::const_iterator i = _job_connections.begin(); i != _job_connections.end(); ++i) {
-		i->disconnect ();
+	BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
+		i.disconnect ();
+	}
+
+	BOOST_FOREACH (boost::signals2::connection& i, _audio_analysis_connections) {
+		i.disconnect ();
 	}
 }
 
@@ -276,7 +277,11 @@ Film::make_dcp ()
 		LOG_GENERAL ("Content: %1", i->technical_summary());
 	}
 	LOG_GENERAL ("DCP video rate %1 fps", video_frame_rate());
-	LOG_GENERAL ("%1 threads", Config::instance()->num_local_encoding_threads());
+	if (Config::instance()->only_servers_encode ()) {
+		LOG_GENERAL_NC ("0 threads: ONLY SERVERS SET TO ENCODE");
+	} else {
+		LOG_GENERAL ("%1 threads", Config::instance()->num_local_encoding_threads());
+	}
 	LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth());
 
 	if (container() == 0) {
@@ -555,15 +560,13 @@ Film::isdcf_name (bool if_created_now) const
 		d << "_" << container()->isdcf_name();
 	}
 
-	ContentList cl = content ();
-
 	/* XXX: this uses the first bit of content only */
 
 	/* The standard says we don't do this for trailers, for some strange reason */
 	if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) {
 		Ratio const * content_ratio = 0;
-		for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) {
-			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+		BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (i);
 			if (vc) {
 				/* Here's the first piece of video content */
 				if (vc->scale().ratio ()) {
@@ -614,8 +617,8 @@ Film::isdcf_name (bool if_created_now) const
 		}
 	} else {
 		list<int> mapped;
-		for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
-			shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (*i);
+		BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+			shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (i);
 			if (ac) {
 				list<int> c = ac->audio_mapping().mapped_output_channels ();
 				copy (c.begin(), c.end(), back_inserter (mapped));
@@ -673,8 +676,18 @@ Film::isdcf_name (bool if_created_now) const
 		d << "-3D";
 	}
 
-	if (!dm.package_type.empty ()) {
-		d << "_" << dm.package_type;
+	bool vf = false;
+	BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+		shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
+		if (dc && (dc->reference_video() || dc->reference_audio() || dc->reference_subtitle())) {
+			vf = true;
+		}
+	}
+
+	if (vf) {
+		d << "_VF";
+	} else {
+		d << "_OV";
 	}
 
 	return d.str ();
@@ -933,7 +946,7 @@ Film::examine_and_add_content (shared_ptr<Content> c)
 	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
 
 	_job_connections.push_back (
-		j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr<Job> (j), boost::weak_ptr<Content> (c)))
+		j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job> (j), weak_ptr<Content> (c)))
 		);
 
 	JobManager::instance()->add (j);
@@ -948,8 +961,19 @@ Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
 	}
 
 	shared_ptr<Content> content = c.lock ();
-	if (content) {
-		add_content (content);
+	if (!content) {
+		return;
+	}
+
+	add_content (content);
+	if (Config::instance()->automatic_audio_analysis ()) {
+		shared_ptr<Playlist> playlist (new Playlist);
+		playlist->add (content);
+		boost::signals2::connection c;
+		JobManager::instance()->analyse_audio (
+			shared_from_this (), playlist, c, bind (&Film::audio_analysis_finished, this)
+			);
+		_audio_analysis_connections.push_back (c);
 	}
 }
 
@@ -982,6 +1006,7 @@ Film::move_content_later (shared_ptr<Content> c)
 	_playlist->move_later (c);
 }
 
+/** @return length of the film from time 0 to the last thing on the playlist */
 DCPTime
 Film::length () const
 {
@@ -1001,7 +1026,7 @@ Film::active_frame_rate_change (DCPTime t) const
 }
 
 void
-Film::playlist_content_changed (boost::weak_ptr<Content> c, int p, bool frequent)
+Film::playlist_content_changed (weak_ptr<Content> c, int p, bool frequent)
 {
 	_dirty = true;
 
@@ -1084,7 +1109,7 @@ Film::make_kdm (
 		).encrypt (signer, target, formulation);
 }
 
-list<dcp::EncryptedKDM>
+list<ScreenKDM>
 Film::make_kdms (
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
@@ -1093,11 +1118,11 @@ Film::make_kdms (
 	dcp::Formulation formulation
 	) const
 {
-	list<dcp::EncryptedKDM> kdms;
+	list<ScreenKDM> kdms;
 
-	for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
-		if ((*i)->certificate) {
-			kdms.push_back (make_kdm ((*i)->certificate.get(), dcp, from, until, formulation));
+	BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+		if (i->certificate) {
+			kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation)));
 		}
 	}
 
@@ -1234,3 +1259,9 @@ Film::remove_content (ContentList c)
 {
 	_playlist->remove (c);
 }
+
+void
+Film::audio_analysis_finished ()
+{
+	/* XXX */
+}