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
This commit is contained in:
Harish Mahendrakar 2016-06-27 14:15:39 +05:30 committed by Hangyu Kuang
parent b4a03ec634
commit 83f2b8ab29

View file

@ -149,6 +149,14 @@ WORD32 ih264d_parse_vui_parametres(vui_t *ps_vu4,
ps_bitstrm, 1); ps_bitstrm, 1);
} }
u4_bits = ih264d_get_bits_h264(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) if(u4_bits)
{ {
ps_vu4->u1_video_format = ih264d_get_bits_h264(ps_bitstrm, 3); ps_vu4->u1_video_format = ih264d_get_bits_h264(ps_bitstrm, 3);