h264_parser: Swap the fallback rule A & B for pic scaling matrix.

media/filters/h264_parser.cc

 // Copyright 2014 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 "media/filters/h264_parser.h"
 
 #include <limits>
 #include <memory>
 
 #include "base/logging.h"
@@ skipping 721 matching lines @@
       res = ParseScalingList(arraysize(pps->scaling_list4x4[i]),
                              pps->scaling_list4x4[i],
                              &use_default);
       if (res != kOk)
         return res;
 
       if (use_default)
         DefaultScalingList4x4(i, pps->scaling_list4x4);
 
     } else {
-      if (sps.seq_scaling_matrix_present_flag) {
+      if (!sps.seq_scaling_matrix_present_flag) {
         // Table 7-2 fallback rule A in spec.
         FallbackScalingList4x4(
             i, kDefault4x4Intra, kDefault4x4Inter, pps->scaling_list4x4);
       } else {
         // Table 7-2 fallback rule B in spec.
         FallbackScalingList4x4(i,
                                sps.scaling_list4x4[0],
                                sps.scaling_list4x4[3],
                                pps->scaling_list4x4);
       }
     }
   }
 
   if (pps->transform_8x8_mode_flag) {
     for (int i = 0; i < ((sps.chroma_format_idc != 3) ? 2 : 6); ++i) {
       READ_BOOL_OR_RETURN(&pic_scaling_list_present_flag);
 
       if (pic_scaling_list_present_flag) {
         res = ParseScalingList(arraysize(pps->scaling_list8x8[i]),
                                pps->scaling_list8x8[i],
                                &use_default);
         if (res != kOk)
           return res;
 
         if (use_default)
           DefaultScalingList8x8(i, pps->scaling_list8x8);
 
       } else {
-        if (sps.seq_scaling_matrix_present_flag) {
+        if (!sps.seq_scaling_matrix_present_flag) {
           // Table 7-2 fallback rule A in spec.
           FallbackScalingList8x8(
               i, kDefault8x8Intra, kDefault8x8Inter, pps->scaling_list8x8);
         } else {
           // Table 7-2 fallback rule B in spec.
           FallbackScalingList8x8(i,
                                  sps.scaling_list8x8[0],
                                  sps.scaling_list8x8[1],
                                  pps->scaling_list8x8);
         }
@@ skipping 693 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace media