Changeset 1128 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

7 Jul 2015, 02:58:30 (10 years ago)

Author:

seregin

Message:

macro cleanup: HIGHER_LAYER_IRAP_SKIP_FLAG, HIGHER_LAYER_IRAP_SKIP_FLAG (keep it for encoder only)

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (5 diffs)
• TDecCu.cpp (modified) (2 diffs)

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

@@ -3468 +3468 @@
 #endif
 
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
   // When higher_layer_irap_skip_flag is not present it is inferred to be equal to 0
   vps->setHigherLayerIrapSkipFlag( false );
-#endif
 }
 
@@ -3662 +3660 @@
   READ_FLAG(uiCode, "cross_layer_pic_type_aligned_flag" );
   vps->setCrossLayerPictureTypeAlignFlag(uiCode);
-  if (!uiCode) 
+
+  if( !uiCode ) 
   {
     READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
@@ -3672 +3671 @@
   }
 
-#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
-  if( uiCode )
+  if( vps->getCrossLayerIrapAlignFlag() )
   {
     READ_FLAG( uiCode, "all_layers_idr_aligned_flag" );
     vps->setCrossLayerAlignedIdrOnlyFlag(uiCode);
   }
-#endif
 
   READ_FLAG( uiCode,        "bit_rate_present_vps_flag" );  vps->setBitRatePresentVpsFlag( uiCode ? true : false );
@@ -3840 +3837 @@
   READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
 #endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
   READ_FLAG(uiCode, "higher_layer_irap_skip_flag" ); vps->setHigherLayerIrapSkipFlag(uiCode == 1 ? true : false);
 
@@ -3848 +3844 @@
     assert( !vps->getHigherLayerIrapSkipFlag() );
   }
-#endif
 #if N0160_VUI_EXT_ILP_REF
   READ_FLAG( uiCode, "ilp_restricted_ref_layers_flag" ); vps->setIlpRestrictedRefLayersFlag( uiCode == 1 );

branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp

@@ -302 +302 @@
   }
  
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
-  if (pcCU->getSlice()->getVPS()->getHigherLayerIrapSkipFlag() && pcCU->getSlice()->getVPS()->getSingleLayerForNonIrapFlag() && pcCU->getLayerId() > 0)
+#if SVC_EXTENSION
+  // Check CU skip for higher layer IRAP skip flag
+  if( pcCU->getSlice()->getVPS()->getHigherLayerIrapSkipFlag() && pcCU->getSlice()->getVPS()->getSingleLayerForNonIrapFlag() && pcCU->getLayerId() > 0 )
   {
     Bool lowerLayerExist = false;
@@ -313 +314 @@
       }
     }
-    if(lowerLayerExist)
-    {
-      assert(pcCU->isSkipped(uiAbsPartIdx));
+
+    if( lowerLayerExist && !pcCU->isSkipped(uiAbsPartIdx) )
+    {
+      printf( "Warning: CU is not skipped with enabled higher layer IRAP skip flag\n" );
     }
   }