commit 83f2b8ab294a1d6c11bcb01a27a4f69b2bf64b20
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Jun 27 14:15:39 2016 +0530
committer Hangyu Kuang <hkuang@google.com> Mon Jul 11 22:29:33 2016 +0000
tree 5f3ef36ed4cb18febf30979f010463c76bfc7844
parent b4a03ec63479ec515d09ab3d0148963628241b0e

DO NOT MERGE Decoder: Initialize few VUI params to signal unspecified values

Initialize video_format to 5 and colour_primaries, transfer_characteristics
and matrix_coefficients to 2 to signal that these are not present in the bitstream.

Bug: 29640760
Change-Id: Ib54ceadcd6d7962e3077bc7266d70983b1d0e141

decoder/ih264d_vui.c

diff --git a/decoder/ih264d_vui.c b/decoder/ih264d_vui.c
index 97b40c2..15bc37d 100644
--- a/decoder/ih264d_vui.c
+++ b/decoder/ih264d_vui.c
@@ -149,6 +149,14 @@
                         ps_bitstrm, 1);
     }
     u4_bits = ih264d_get_bits_h264(ps_bitstrm, 1);
+    /* Initialize to unspecified (5 for video_format and
+       2 for colour_primaries, tfr_chars, matrix_coeffs  */
+    ps_vu4->u1_video_format = 5;
+    ps_vu4->u1_video_full_range_flag = 0;
+    ps_vu4->u1_colour_primaries = 2;
+    ps_vu4->u1_tfr_chars = 2;
+    ps_vu4->u1_matrix_coeffs = 2;
+
     if(u4_bits)
     {
         ps_vu4->u1_video_format = ih264d_get_bits_h264(ps_bitstrm, 3);