- Add COLR atom support to mpeg4ip

 - Add COLR atom to mp4 video tracks
 - Add colorspace info to h.264 VUI header


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1528 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 17 insertions, 0 deletions

diff --git a/libhb/encx264.c b/libhb/encx264.c
index 6c1f347e0..da8c7f979 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -198,6 +198,23 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
         free(x264opts_start);
     }
 
+    /* set up the VUI color model & gamma to match what the COLR atom
+     * set in muxmp4.c says. See libhb/muxmp4.c for notes. */
+
+    if ( job->title->height >= 720 )
+    {
+        // we guess that 720p or above is ITU BT.709 HD content
+        param.vui.i_colorprim = 1;
+        param.vui.i_transfer = 1;
+        param.vui.i_colmatrix = 1;
+    }
+    else
+    {
+        // ITU BT.601 DVD or SD TV content
+        param.vui.i_colorprim = 6;
+        param.vui.i_transfer = 1;
+        param.vui.i_colmatrix = 6;
+    }
 
     if( job->pixel_ratio )
     {