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

embedded in the HMAC (#1232).

diff --git a/ChangeLog b/ChangeLog
index f76391f6ad29f3d1043608b5d8e80641113cf5b8..1362a47c02004c167b9db019b7b2d47fd5c35ae9 100644 (file)
--- 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-05  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.11.70 released.

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 10e4514fbcc134ef333d333d5086511b6b5660a3..deb93b6c184f4c60b2e8be122b299aeeac39d08c 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -634,6 +634,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.
        */