Changeset 1012 in SHVCSoftware

Timestamp:

4 Feb 2015, 00:25:57 (10 years ago)

Author:

seregin

Message:

port the fix to the ticket #55 (rev 1011)

Location:

branches/SHM-upgrade/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -4009 +4009 @@
     READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
     vps->setCrossLayerIrapAlignFlag(uiCode);
+#endif
+#if O0223_PICTURE_TYPES_ALIGN_FLAG
+  }
+  else
+  {
+    vps->setCrossLayerIrapAlignFlag(true);
+  }
+#endif
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
-    if( uiCode )
-    {
-      READ_FLAG( uiCode, "all_layers_idr_aligned_flag" );
-      vps->setCrossLayerAlignedIdrOnlyFlag(uiCode);
-    }
-#endif
-#endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
-  }
-  else
-  {
-    vps->setCrossLayerIrapAlignFlag(true);
+  if( uiCode )
+  {
+    READ_FLAG( uiCode, "all_layers_idr_aligned_flag" );
+    vps->setCrossLayerAlignedIdrOnlyFlag(uiCode);
   }
 #endif
@@ -4199 +4199 @@
   {
 #if VPS_FIX_TO_MATCH_SPEC
-      for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getMaxLayers(); i++ )
-#else
-      for (i = 0; i < vps->getMaxLayers(); i++)
+    for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getMaxLayers(); i++ )
+#else
+    for (i = 0; i < vps->getMaxLayers(); i++)
 #endif
     {

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2839 +2839 @@
 #if IRAP_ALIGN_FLAG_IN_VPS_VUI
     WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
-#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
-    if(vps->getCrossLayerIrapAlignFlag())
-    {
-       WRITE_FLAG(vps->getCrossLayerAlignedIdrOnlyFlag(), "all_layers_idr_aligned_flag");
-    }
-#endif
 #endif 
 #if O0223_PICTURE_TYPES_ALIGN_FLAG
   }
-#endif
+  else
+  {
+    vps->setCrossLayerIrapAlignFlag(vps->getVpsVuiPresentFlag()); // When not present, the value of cross_layer_irap_aligned_flag is inferred to be equal to vps_vui_present_flag
+  }
+#endif
+#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
+  if(vps->getCrossLayerIrapAlignFlag())
+  {
+    WRITE_FLAG(vps->getCrossLayerAlignedIdrOnlyFlag(), "all_layers_idr_aligned_flag");
+  }
+#endif
+
   WRITE_FLAG( vps->getBitRatePresentVpsFlag(),        "bit_rate_present_vps_flag" );
   WRITE_FLAG( vps->getPicRatePresentVpsFlag(),        "pic_rate_present_vps_flag" );