Changeset 1109 in SHVCSoftware for branches

Timestamp:

6 Jul 2015, 21:09:31 (9 years ago)

Author:

seregin

Message:

macro cleanup: SIGNALLING_BITRATE_PICRATE_FIX

Location:

branches/SHM-dev/source/Lib

Files:

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

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -47 +47 @@
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
 #define FIX_NON_OUTPUT_LAYER             1
-#define SIGNALLING_BITRATE_PICRATE_FIX   1      ///< Fix for signalling of bitrate and picture rate info in VPS VUI to be more aligned to JCTVC-R1008
 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
 #define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture

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

@@ -3842 +3842 @@
   READ_FLAG( uiCode,        "pic_rate_present_vps_flag" );  vps->setPicRatePresentVpsFlag( uiCode ? true : false );
 
-#if SIGNALLING_BITRATE_PICRATE_FIX
   if ( vps->getBitRatePresentVpsFlag() || vps->getPicRatePresentVpsFlag() )
   {
@@ -3880 +3879 @@
     }
   }
-#else
-  Bool parseFlag = vps->getBitRatePresentVpsFlag() || vps->getPicRatePresentVpsFlag();
-
-#if Q0078_ADD_LAYER_SETS
-#if R0227_BR_PR_ADD_LAYER_SET
-  for( i = 0; i < vps->getNumLayerSets(); i++ )
-#else
-  for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ )
-#endif
-#else
-  for( i = 0; i < vps->getNumLayerSets(); i++ )
-#endif
-  {
-#if BITRATE_PICRATE_SIGNALLING
-    for( j = 0; j <= vps->getMaxSLayersInLayerSetMinus1(i); j++ )
-#else
-    for( j = 0; j < vps->getMaxTLayers(); j++ )
-#endif
-    {
-      if( parseFlag && vps->getBitRatePresentVpsFlag() )
-      {
-        READ_FLAG( uiCode,        "bit_rate_present_flag[i][j]" );  vps->setBitRatePresentFlag( i, j, uiCode ? true : false );
-      }
-      else
-      {
-        vps->setBitRatePresentFlag( i, j, false );
-      }
-      if( parseFlag && vps->getPicRatePresentVpsFlag() )
-      {
-        READ_FLAG( uiCode,        "pic_rate_present_flag[i][j]" );  vps->setPicRatePresentFlag( i, j, uiCode ? true : false );
-      }
-      else
-      {
-        vps->setPicRatePresentFlag( i, j, false );
-      }
-      if( parseFlag && vps->getBitRatePresentFlag(i, j) )
-      {
-        READ_CODE( 16, uiCode,    "avg_bit_rate[i][j]" ); vps->setAvgBitRate( i, j, uiCode );
-        READ_CODE( 16, uiCode,    "max_bit_rate[i][j]" ); vps->setMaxBitRate( i, j, uiCode );
-      }
-      else
-      {
-        vps->setAvgBitRate( i, j, 0 );
-        vps->setMaxBitRate( i, j, 0 );
-      }
-      if( parseFlag && vps->getPicRatePresentFlag(i, j) )
-      {
-        READ_CODE( 2 , uiCode,    "constant_pic_rate_idc[i][j]" ); vps->setConstPicRateIdc( i, j, uiCode );
-        READ_CODE( 16, uiCode,    "avg_pic_rate[i][j]"          ); vps->setAvgPicRate( i, j, uiCode );
-      }
-      else
-      {
-        vps->setConstPicRateIdc( i, j, 0 );
-        vps->setAvgPicRate     ( i, j, 0 );
-      }
-    }
-  }
-#endif
+
 #if VPS_VUI_VIDEO_SIGNAL_MOVE
   READ_FLAG( uiCode, "video_signal_info_idx_present_flag" ); vps->setVideoSigPresentVpsFlag( uiCode == 1 );

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

@@ -2686 +2686 @@
 #if Q0078_ADD_LAYER_SETS
 #if R0227_BR_PR_ADD_LAYER_SET
-#if SIGNALLING_BITRATE_PICRATE_FIX
     for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getNumLayerSets(); i++ )
-#else
-    for( i = 0; i < vps->getNumLayerSets(); i++ )
-#endif
 #else
     for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ )