VAVDA: Fix Baseline profile handling in H264 parser.

content/common/gpu/media/h264_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/h264_parser.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 
@@ skipping 636 matching lines @@
           FallbackScalingList8x8(i, sps.scaling_list8x8[0],
                                  sps.scaling_list8x8[1], pps->scaling_list8x8);
         }
       }
     }
   }
   return kOk;
 }
 
 static void FillDefaultSeqScalingLists(H264SPS* sps) {
-  // Assumes ints in arrays.
-  memset(sps->scaling_list4x4, 16, sizeof(sps->scaling_list4x4));

[Ami GONE FROM CHROMIUM, 2012/07/26 19:32:12]

This is pretty awesome; were we setting each int to 
16<<24 | 16<<16 | 16<<8 | 16
instead of just plain
16
?

[Pawel Osciak, 2012/07/26 19:48:49]

No, we were casting this to chars later on. But didn't want to leave this here
anyway. Just cleaning up here, the real fix is in ParseSPS() below.

-  memset(sps->scaling_list8x8, 16, sizeof(sps->scaling_list8x8));
+  for (int i = 0; i < 6; ++i)
+    for (int j = 0; j < kH264ScalingList4x4Length; ++j)
+      sps->scaling_list4x4[i][j] = 16;
+
+  for (int i = 0; i < 6; ++i)
+    for (int j = 0; j < kH264ScalingList8x8Length; ++j)
+      sps->scaling_list8x8[i][j] = 16;
+
 }
 
 H264Parser::Result H264Parser::ParseSPS(int* sps_id) {
   // See 7.4.2.1.
   int data;
   Result res;
 
   *sps_id = -1;
 
   scoped_ptr<H264SPS> sps(new H264SPS());
 
   READ_BITS_OR_RETURN(8, &sps->profile_idc);
   READ_BITS_OR_RETURN(6, &sps->constraint_setx_flag);
   READ_BITS_OR_RETURN(2, &data);
   READ_BITS_OR_RETURN(8, &sps->level_idc);
   READ_UE_OR_RETURN(&sps->seq_parameter_set_id);
   TRUE_OR_RETURN(sps->seq_parameter_set_id < 32);
 
   if (sps->profile_idc == 100 || sps->profile_idc == 110 ||
       sps->profile_idc == 122 || sps->profile_idc == 244 ||
       sps->profile_idc ==  44 || sps->profile_idc ==  83 ||
       sps->profile_idc ==  86 || sps->profile_idc == 118 ||
       sps->profile_idc == 128) {
     READ_UE_OR_RETURN(&sps->chroma_format_idc);
     TRUE_OR_RETURN(sps->chroma_format_idc < 4);
 
     if (sps->chroma_format_idc == 3)
       READ_BOOL_OR_RETURN(&sps->separate_colour_plane_flag);
 
-    if (sps->separate_colour_plane_flag)
-      sps->chroma_array_type = 0;
-    else
-      sps->chroma_array_type = sps->chroma_format_idc;
-
     READ_UE_OR_RETURN(&sps->bit_depth_luma_minus8);
     TRUE_OR_RETURN(sps->bit_depth_luma_minus8 < 7);
 
     READ_UE_OR_RETURN(&sps->bit_depth_chroma_minus8);
     TRUE_OR_RETURN(sps->bit_depth_chroma_minus8 < 7);
 
     READ_BOOL_OR_RETURN(&sps->qpprime_y_zero_transform_bypass_flag);
     READ_BOOL_OR_RETURN(&sps->seq_scaling_matrix_present_flag);
 
     if (sps->seq_scaling_matrix_present_flag) {
       DVLOG(4) << "Scaling matrix present";
       res = ParseSPSScalingLists(sps.get());
       if (res != kOk)
         return res;
     } else {
       FillDefaultSeqScalingLists(sps.get());
     }
+  } else {
+    sps->chroma_format_idc = 1;
+    FillDefaultSeqScalingLists(sps.get());
   }
 
+  if (sps->separate_colour_plane_flag)
+    sps->chroma_array_type = 0;
+  else
+    sps->chroma_array_type = sps->chroma_format_idc;
+
   READ_UE_OR_RETURN(&sps->log2_max_frame_num_minus4);
   TRUE_OR_RETURN(sps->log2_max_frame_num_minus4 < 13);
 
   READ_UE_OR_RETURN(&sps->pic_order_cnt_type);
   TRUE_OR_RETURN(sps->pic_order_cnt_type < 3);
 
   if (sps->pic_order_cnt_type == 0) {
     READ_UE_OR_RETURN(&sps->log2_max_pic_order_cnt_lsb_minus4);
     TRUE_OR_RETURN(sps->log2_max_pic_order_cnt_lsb_minus4 < 13);
   } else if (sps->pic_order_cnt_type == 1) {
@@ skipping 77 matching lines @@
   TRUE_OR_RETURN(pps->weighted_bipred_idc < 3);
 
   READ_SE_OR_RETURN(&pps->pic_init_qp_minus26);
   IN_RANGE_OR_RETURN(pps->pic_init_qp_minus26, -26, 25);
 
   READ_SE_OR_RETURN(&pps->pic_init_qs_minus26);
   IN_RANGE_OR_RETURN(pps->pic_init_qs_minus26, -26, 25);
 
   READ_SE_OR_RETURN(&pps->chroma_qp_index_offset);
   IN_RANGE_OR_RETURN(pps->chroma_qp_index_offset, -12, 12);
+  pps->second_chroma_qp_index_offset = pps->chroma_qp_index_offset;
 
   READ_BOOL_OR_RETURN(&pps->deblocking_filter_control_present_flag);
   READ_BOOL_OR_RETURN(&pps->constrained_intra_pred_flag);
   READ_BOOL_OR_RETURN(&pps->redundant_pic_cnt_present_flag);
 
   if (br_.HasMoreRBSPData()) {
     READ_BOOL_OR_RETURN(&pps->transform_8x8_mode_flag);
     READ_BOOL_OR_RETURN(&pps->pic_scaling_matrix_present_flag);
 
     if (pps->pic_scaling_matrix_present_flag) {
@@ skipping 382 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace content