Don't fake-write encrypted video frames as the asset ID is somehow (?)

embedded in the HMAC (#1232).

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e9e5a24b..3bf12175c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Fix bad DCPs when re-making in encrypted projects (#1232).
+
 2018-03-02  Carl Hetherington  <cth@carlh.net>
 
 	* Fix bad Prores exports in some cases (#1227).
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 227de6277..d6c3370b0 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -637,6 +637,11 @@ Writer::write_cover_sheet ()
 bool
 Writer::can_fake_write (Frame frame) const
 {
+	if (_film->encrypted()) {
+		/* We need to re-write the frame because the asset ID is embedded in the HMAC... I think... */
+		return false;
+	}
+
 	/* We have to do a proper write of the first frame so that we can set up the JPEG2000
 	   parameters in the asset writer.
 	*/