Changeset 1118 in SHVCSoftware for branches

Timestamp:

7 Jul 2015, 01:40:13 (9 years ago)

Author:

seregin

Message:

macro cleanup: REPN_FORMAT_CONTROL_FLAG

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (2 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -165 +165 @@
   {
     RepFormat *repFormat = vps->getVpsRepFormat( idx );
-#if REPN_FORMAT_CONTROL_FLAG
     repFormat->setChromaAndBitDepthVpsPresentFlag                         ( true ); 
     if (idx==0)
@@ -171 +170 @@
       assert(repFormat->getChromaAndBitDepthVpsPresentFlag() == true); 
     }
-#endif 
+
     repFormat->setPicWidthVpsInLumaSamples                                ( m_acLayerCfg[mapIdxToLayer[idx]].getSourceWidth()   );
     repFormat->setPicHeightVpsInLumaSamples                               ( m_acLayerCfg[mapIdxToLayer[idx]].getSourceHeight()  );

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

@@ -511 +511 @@
 class RepFormat
 {
-#if REPN_FORMAT_CONTROL_FLAG
   Bool m_chromaAndBitDepthVpsPresentFlag;
-#endif 
 #if AUXILIARY_PICTURES
   ChromaFormat m_chromaFormatVpsIdc;
@@ -529 +527 @@
 public:
   RepFormat();
-#if REPN_FORMAT_CONTROL_FLAG
   Bool getChromaAndBitDepthVpsPresentFlag() { return m_chromaAndBitDepthVpsPresentFlag; }
   void setChromaAndBitDepthVpsPresentFlag(Bool x) { m_chromaAndBitDepthVpsPresentFlag = x; }
-#endif 
 
 #if AUXILIARY_PICTURES

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

@@ -125 +125 @@
 #define NO_OUTPUT_OF_PRIOR_PICS          1      ///< Use no_output_of_prior_pics_flag
 #define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
-#if REPN_FORMAT_IN_VPS
-#define REPN_FORMAT_CONTROL_FLAG         1      ///< JCTVC-O0179: Add control flag in representation format to control sending of chroma and bitdepth parameters
-#endif 
 #define RPL_INIT_N0316_N0082             1      ///< JCTVC-N0316, JCTVC-N0082: initial reference picture list construction 
 

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

@@ -3571 +3571 @@
 {
   UInt uiCode;
-#if REPN_FORMAT_CONTROL_FLAG  
   READ_CODE( 16, uiCode, "pic_width_vps_in_luma_samples" );        repFormat->setPicWidthVpsInLumaSamples ( uiCode );
   READ_CODE( 16, uiCode, "pic_height_vps_in_luma_samples" );       repFormat->setPicHeightVpsInLumaSamples( uiCode );
@@ -3609 +3608 @@
     repFormat->setBitDepthVpsChroma         ( repFormatPrev->getBitDepthVpsChroma() );
   }
-
-#else 
-#if AUXILIARY_PICTURES
-  READ_CODE( 2, uiCode, "chroma_format_idc" );               repFormat->setChromaFormatVpsIdc( ChromaFormat(uiCode) );
-#else
-  READ_CODE( 2, uiCode, "chroma_format_idc" );               repFormat->setChromaFormatVpsIdc( uiCode );
-#endif
-
-  if( repFormat->getChromaFormatVpsIdc() == 3 )
-  {
-    READ_FLAG( uiCode, "separate_colour_plane_flag");        repFormat->setSeparateColourPlaneVpsFlag(uiCode ? true : false);
-  }
-
-  READ_CODE ( 16, uiCode, "pic_width_in_luma_samples" );     repFormat->setPicWidthVpsInLumaSamples ( uiCode );
-  READ_CODE ( 16, uiCode, "pic_height_in_luma_samples" );    repFormat->setPicHeightVpsInLumaSamples( uiCode );
-
-  READ_CODE( 4, uiCode, "bit_depth_luma_minus8" );           repFormat->setBitDepthVpsLuma  ( uiCode + 8 );
-  READ_CODE( 4, uiCode, "bit_depth_chroma_minus8" );         repFormat->setBitDepthVpsChroma( uiCode + 8 );
-#endif 
 
   READ_FLAG( uiCode, "conformance_window_vps_flag" );

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

@@ -2452 +2452 @@
 Void  TEncCavlc::codeRepFormat( RepFormat *repFormat )
 {
-#if REPN_FORMAT_CONTROL_FLAG
   WRITE_CODE( repFormat->getPicWidthVpsInLumaSamples (), 16, "pic_width_vps_in_luma_samples" );    
   WRITE_CODE( repFormat->getPicHeightVpsInLumaSamples(), 16, "pic_height_vps_in_luma_samples" );  
@@ -2471 +2470 @@
     WRITE_CODE( repFormat->getBitDepthVpsChroma() - 8, 4, "bit_depth_vps_chroma_minus8" );
   }
-#else 
-  WRITE_CODE( repFormat->getChromaFormatVpsIdc(), 2, "chroma_format_idc" );    
-  
-  if( repFormat->getChromaFormatVpsIdc() == 3 )
-  {
-    WRITE_FLAG( repFormat->getSeparateColourPlaneVpsFlag(), "separate_colour_plane_flag");      
-  }
-
-  WRITE_CODE ( repFormat->getPicWidthVpsInLumaSamples (), 16, "pic_width_in_luma_samples" );    
-  WRITE_CODE ( repFormat->getPicHeightVpsInLumaSamples(), 16, "pic_height_in_luma_samples" );    
-  
-  assert( repFormat->getBitDepthVpsLuma() >= 8 );
-  assert( repFormat->getBitDepthVpsChroma() >= 8 );
-  WRITE_CODE( repFormat->getBitDepthVpsLuma() - 8,   4, "bit_depth_luma_minus8" );           
-  WRITE_CODE( repFormat->getBitDepthVpsChroma() - 8, 4, "bit_depth_chroma_minus8" );
-#endif
 
   Window conf = repFormat->getConformanceWindowVps();