Changeset 1185 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

8 Jul 2015, 03:34:13 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_BSP_HRD_PARAMS, R0227_VUI_BSP_HRD_FLAG

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (10 diffs)

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

@@ -602 +602 @@
       READ_CODE( 5, uiCode, "dpb_output_delay_length_minus1" );       hrd->setDpbOutputDelayLengthMinus1( uiCode );
     }
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
     else
     {
@@ -3529 +3529 @@
 #if O0164_MULTI_LAYER_HRD
   READ_FLAG(uiCode, "vps_vui_bsp_hrd_present_flag" ); vps->setVpsVuiBspHrdPresentFlag(uiCode);
-  if (vps->getVpsVuiBspHrdPresentFlag())
-  {
-#if VPS_VUI_BSP_HRD_PARAMS
+
+  if( vps->getVpsVuiBspHrdPresentFlag() )
+  {
     parseVpsVuiBspHrdParams(vps);
-#else
-#if R0227_VUI_BSP_HRD_FLAG
-    assert (vps->getTimingInfo()->getTimingInfoPresentFlag() == 1);
-#endif
-    READ_UVLC( uiCode, "vps_num_bsp_hrd_parameters_minus1" ); vps->setVpsNumBspHrdParametersMinus1(uiCode);
-    vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
-    for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
-    {
-      if( i > 0 )
-      {
-        READ_FLAG( uiCode, "bsp_cprms_present_flag[i]" ); vps->setBspCprmsPresentFlag(i, uiCode);
-      }
-      parseHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
-    }
-    for (UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++)
-    {
-      READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode);
-#if HRD_BPB
-      Int chkPart=0;
-#endif
-      for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
-      {
-        for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
-        {
-          if( vps->getLayerIdIncludedFlag(h, j) )
-          {
-            READ_FLAG( uiCode, "layer_in_bsp_flag[h][i][j]" ); vps->setLayerInBspFlag(h, i, j, uiCode);
-          }
-        }
-#if HRD_BPB
-        chkPart+=vps->getLayerInBspFlag(h, i, j);
-#endif
-      }
-#if HRD_BPB
-      assert(chkPart<=1);
-#endif
-#if HRD_BPB
-      if(vps->getNumBitstreamPartitions(h)==1)
-      {
-        Int chkPartition1=0; Int chkPartition2=0;
-        for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
-        {
-          if( vps->getLayerIdIncludedFlag(h, j) )
-          {
-            chkPartition1+=vps->getLayerInBspFlag(h, 0, j);
-            chkPartition2++;
-          }
-        }
-        assert(chkPartition1!=chkPartition2);
-      }
-#endif
-      if (vps->getNumBitstreamPartitions(h))
-      {
-#if Q0182_MULTI_LAYER_HRD_UPDATE
-        READ_UVLC( uiCode, "num_bsp_sched_combinations_minus1[h]"); vps->setNumBspSchedCombinations(h, uiCode + 1);
-#else
-        READ_UVLC( uiCode, "num_bsp_sched_combinations[h]"); vps->setNumBspSchedCombinations(h, uiCode);
-#endif
-        for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
-        {
-          for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
-          {
-            READ_UVLC( uiCode, "bsp_comb_hrd_idx[h][i][j]"); vps->setBspCombHrdIdx(h, i, j, uiCode);
-#if HRD_BPB
-            assert(uiCode <= vps->getVpsNumBspHrdParametersMinus1());
-#endif
-
-            READ_UVLC( uiCode, "bsp_comb_sched_idx[h][i][j]"); vps->setBspCombSchedIdx(h, i, j, uiCode);
-#if HRD_BPB
-            assert(uiCode <= vps->getBspHrdParamBufferCpbCntMinus1(uiCode,vps->getMaxTLayers()-1));
-#endif
-          }
-        }
-      }
-    }
-#endif
   }
 #endif
@@ -3635 +3559 @@
   assert( uiCode == 0 );
 }
-#endif
 
 #if Q0048_CGS_3D_ASYMLUT
@@ -3846 +3769 @@
 }
 #endif
-#if VPS_VUI_BSP_HRD_PARAMS
+#endif
+
 Void TDecCavlc::parseVpsVuiBspHrdParams( TComVPS *vps )
 {
@@ -3868 +3792 @@
       }
     }
+
     READ_UVLC( uiCode, "num_sub_layer_hrd_minus1[i]" ); vps->setNumSubLayerHrdMinus1(j, uiCode );
     assert( uiCode <= vps->getMaxTLayers() - 1 );
     
     parseHrdParameters( vps->getBspHrd(j), vps->getCprmsAddPresentFlag(j), vps->getNumSubLayerHrdMinus1(j) );
+
     if( i > 0 && !vps->getCprmsAddPresentFlag(i) )
     {
@@ -3885 +3811 @@
     }
   }
+
   if( vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams() > 0 )
   {
@@ -3891 +3818 @@
       Int lsIdx = vps->getOutputLayerSetIdx(h);
       READ_UVLC(uiCode, "num_signalled_partitioning_schemes[h]"); vps->setNumSignalledPartitioningSchemes(h, uiCode);
+
       for (Int j = 1; j < vps->getNumSignalledPartitioningSchemes(h) + 1; j++)
       {
         READ_UVLC(uiCode, "num_partitions_in_scheme_minus1[h][j]"); vps->setNumPartitionsInSchemeMinus1(h, j, uiCode);
-        for (Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, j); k++)
-        {
-          for (Int r = 0; r < vps->getNumLayersInIdList(lsIdx); r++)
+
+        for( Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, j); k++ )
+        {
+          for( Int r = 0; r < vps->getNumLayersInIdList(lsIdx); r++ )
           {
             READ_FLAG(uiCode, "layer_included_in_partition_flag[h][j][k][r]"); vps->setLayerIncludedInPartitionFlag(h, j, k, r, uiCode ? true : false);
@@ -3902 +3831 @@
         }
       }
-      for (Int i = 0; i < vps->getNumSignalledPartitioningSchemes(h) + 1; i++)
-      {
-        for (Int t = 0; t <= vps->getMaxSLayersInLayerSetMinus1(lsIdx); t++)
+
+      for( Int i = 0; i < vps->getNumSignalledPartitioningSchemes(h) + 1; i++ )
+      {
+        for( Int t = 0; t <= vps->getMaxSLayersInLayerSetMinus1(lsIdx); t++ )
         {
           READ_UVLC(uiCode, "num_bsp_schedules_minus1[h][i][t]");              vps->setNumBspSchedulesMinus1(h, i, t, uiCode);
-          for (Int j = 0; j <= vps->getNumBspSchedulesMinus1(h, i, t); j++)
+
+          for( Int j = 0; j <= vps->getNumBspSchedulesMinus1(h, i, t); j++)
           {
             for( Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, i); k++ )
@@ -3914 +3845 @@
               {
                 Int numBits = 1;
-                while ((1 << numBits) < (vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams()))
+
+                while( (1 << numBits) < (vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams()) )
                 {
                   numBits++;
                 }
+
                 READ_CODE(numBits, uiCode, "bsp_comb_hrd_idx[h][i][t][j][k]");      vps->setBspHrdIdx(h, i, t, j, k, uiCode);
               }
+
               READ_UVLC(uiCode, "bsp_comb_sched_idx[h][i][t][j][k]");    vps->setBspSchedIdx(h, i, t, j, k, uiCode);
             }
@@ -3932 +3866 @@
   }
 }
-#endif
-#endif
+#endif //SVC_EXTENSION
 //! \}