X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=b1dcb46d7e473b34be81dbc3ba83139cf31a07e2;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hp=a89d58a1f7e760da27f4c2913a30cefab3bb15c3;hpb=142f7dee139074294d35c630ecee67b85e8a98fc;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a89d58a1f..b1dcb46d7 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -50,10 +50,12 @@
 #include "text_content.h"
 #include "ffmpeg_content.h"
 #include "dcp_content.h"
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 #include "cinema.h"
 #include "change_signaller.h"
 #include "check_content_change_job.h"
+#include "ffmpeg_subtitle_stream.h"
+#include "font.h"
 #include <libcxml/cxml.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
@@ -130,8 +132,10 @@ string const Film::metadata_file = "metadata.xml";
  * 36 -> 37
  * TextContent can be in a Caption tag, and some of the tag names
  * have had Subtitle prefixes or suffixes removed.
+ * 37 -> 38
+ * VideoContent scale expressed just as "guess" or "custom"
  */
-int const Film::current_state_version = 37;
+int const Film::current_state_version = 38;
 
 /** Construct a Film object in a given directory.
  *
@@ -302,6 +306,39 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
 	return p;
 }
 
+
+boost::filesystem::path
+Film::subtitle_analysis_path (shared_ptr<const Content> content) const
+{
+	boost::filesystem::path p = dir ("analysis");
+
+	Digester digester;
+	digester.add (content->digest());
+
+	if (!content->text.empty()) {
+		shared_ptr<TextContent> tc = content->text.front();
+		digester.add (tc->x_scale());
+		digester.add (tc->y_scale());
+		BOOST_FOREACH (shared_ptr<dcpomatic::Font> i, tc->fonts()) {
+			digester.add (i->id());
+		}
+		if (tc->effect()) {
+			digester.add (tc->effect().get());
+		}
+		digester.add (tc->line_spacing());
+		digester.add (tc->outline_width());
+	}
+
+	shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent>(content);
+	if (fc) {
+		digester.add (fc->subtitle_stream()->identifier());
+	}
+
+	p /= digester.get ();
+	return p;
+}
+
+
 /** Add suitable Jobs to the JobManager to create a DCP for this Film.
  *  @param gui true if this is being called from a GUI tool.
  *  @param check true to check the content in the project for changes before making the DCP.
@@ -752,11 +789,7 @@ Film::isdcf_name (bool if_created_now) const
 		BOOST_FOREACH (shared_ptr<Content> i, content ()) {
 			if (i->video) {
 				/* Here's the first piece of video content */
-				if (i->video->scale().ratio ()) {
-					content_ratio = i->video->scale().ratio ();
-				} else {
-					content_ratio = Ratio::from_ratio (i->video->size().ratio ());
-				}
+				content_ratio = Ratio::nearest_from_ratio(i->video->scaled_size(frame_size()).ratio());
 				break;
 			}
 		}
@@ -1467,47 +1500,6 @@ Film::make_kdm (
 		).encrypt (signer, recipient, trusted_devices, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
 }
 
-/** @param screens Screens to make KDMs for.
- *  @param cpl_file Path to CPL to make KDMs for.
- *  @param from KDM from time expressed as a local time in the time zone of the Screen's Cinema.
- *  @param until KDM to time expressed as a local time in the time zone of the Screen's Cinema.
- *  @param formulation KDM formulation to use.
- *  @param disable_forensic_marking_picture true to disable forensic marking of picture.
- *  @param disable_forensic_marking_audio if not set, don't disable forensic marking of audio.  If set to 0,
- *  disable all forensic marking; if set above 0, disable forensic marking above that channel.
- */
-list<shared_ptr<ScreenKDM> >
-Film::make_kdms (
-	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path cpl_file,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime until,
-	dcp::Formulation formulation,
-	bool disable_forensic_marking_picture,
-	optional<int> disable_forensic_marking_audio
-	) const
-{
-	list<shared_ptr<ScreenKDM> > kdms;
-
-	BOOST_FOREACH (shared_ptr<Screen> i, screens) {
-		if (i->recipient) {
-			dcp::EncryptedKDM const kdm = make_kdm (
-				i->recipient.get(),
-				i->trusted_device_thumbprints(),
-				cpl_file,
-				dcp::LocalTime (from,  i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
-				dcp::LocalTime (until, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
-				formulation,
-				disable_forensic_marking_picture,
-				disable_forensic_marking_audio
-				);
-
-			kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm)));
-		}
-	}
-
-	return kdms;
-}
 
 /** @return The approximate disk space required to encode a DCP of this film with the
  *  current settings, in bytes.