+ HEVC: add missing parsing of some multilayer SPS elements

Signed-off-by: James Almer <[email protected]>
MediaArea · Jul 7, 2024 · 0fdaf8f · 0fdaf8f
1 parent a4e80f0
commit 0fdaf8f
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Source/MediaInfo/Video/File_Hevc.cpp b/Source/MediaInfo/Video/File_Hevc.cpp
@@ -1914,8 +1914,9 @@ void File_Hevc::seq_parameter_set()
     }
     if (nuh_layer_id)
     {
-        max_sub_layers_minus1=0;
+        const auto& vps_max_sub_layers_minus1 = (*video_parameter_set_Item)->vps_max_sub_layers_minus1;
         Get_S1 (3, sps_ext_or_max_sub_layers_minus1,            "sps_ext_or_max_sub_layers_minus1");
+        max_sub_layers_minus1=sps_ext_or_max_sub_layers_minus1 == 7 ? vps_max_sub_layers_minus1 : sps_ext_or_max_sub_layers_minus1;
     }
     else
     {
@@ -2046,9 +2047,16 @@ void File_Hevc::seq_parameter_set()
     Skip_UE(                                                    "max_transform_hierarchy_depth_inter");
     Skip_UE(                                                    "max_transform_hierarchy_depth_intra");
     TEST_SB_SKIP(                                               "scaling_list_enabled_flag");
-        TEST_SB_SKIP(                                           "sps_scaling_list_data_present_flag");
-            scaling_list_data();
-        TEST_SB_END();
+        bool sps_infer_scaling_list_flag = false;
+        if (MultiLayerExtSpsFlag)
+           Get_SB (sps_infer_scaling_list_flag,                 "sps_infer_scaling_list_flag");
+        if (sps_infer_scaling_list_flag)
+           Skip_S1 (6,                                          "sps_scaling_list_ref_layer_id");
+        else {
+            TEST_SB_SKIP(                                       "sps_scaling_list_data_present_flag");
+                scaling_list_data();
+            TEST_SB_END();
+        }
     TEST_SB_END();
     Skip_SB(                                                    "amp_enabled_flag");
     Skip_SB(                                                    "sample_adaptive_offset_enabled_flag");