Add setup of progression order change (POC) in J2K for 4K (from OpenDCP).

diff --git a/ChangeLog b/ChangeLog
index e1986b0fd22ce26697186b0ad39f456720c55de7..8d3148e020c230d8b9266ecac1126532e1fa43b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-27  Carl Hetherington  <cth@carlh.net>
+
+       * More speculative fixes for 4K.
+
 2013-12-23  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.51 released.

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index e719d7ef4f4be87d205796a1d03d521c968722f8..00dc1ac74e32456b24ee86840b5a67a797c701a9 100644 (file)
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -197,6 +197,24 @@ DCPVideoFrame::encode_locally ()
        parameters.tcp_numlayers++;
        parameters.cp_disto_alloc = 1;
        parameters.cp_rsiz = _resolution == RESOLUTION_2K ? CINEMA2K : CINEMA4K;
+       if (_resolution == RESOLUTION_4K) {
+               parameters.numpocs = 2;
+               parameters.POC[0].tile = 1;
+               parameters.POC[0].resno0 = 0; 
+               parameters.POC[0].compno0 = 0;
+               parameters.POC[0].layno1 = 1;
+               parameters.POC[0].resno1 = parameters.numresolution - 1;
+               parameters.POC[0].compno1 = 3;
+               parameters.POC[0].prg1 = CPRL;
+               parameters.POC[1].tile = 1;
+               parameters.POC[1].resno0 = parameters.numresolution - 1; 
+               parameters.POC[1].compno0 = 0;
+               parameters.POC[1].layno1 = 1;
+               parameters.POC[1].resno1 = parameters.numresolution;
+               parameters.POC[1].compno1 = 3;
+               parameters.POC[1].prg1 = CPRL;
+       }
+       
        parameters.cp_comment = strdup (N_("DCP-o-matic"));
        parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24;