Changeset 1147 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

7 Jul 2015, 23:55:42 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0098_SCALED_REF_LAYER_ID

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (9 diffs)
• TAppEncLayerCfg.cpp (modified) (1 diff)
• TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -781 +781 @@
   string* cfg_predLayerIdsPtr    [MAX_LAYERS];
 #endif
-#if O0098_SCALED_REF_LAYER_ID
   string    cfg_refLocationOffsetLayerId [MAX_LAYERS];
-#endif
   string    cfg_scaledRefLayerLeftOffset [MAX_LAYERS];
   string    cfg_scaledRefLayerTopOffset [MAX_LAYERS];
@@ -800 +798 @@
   string    cfg_phaseHorChroma [MAX_LAYERS];
   string    cfg_phaseVerChroma [MAX_LAYERS];
-
-#if O0098_SCALED_REF_LAYER_ID
   string*    cfg_refLocationOffsetLayerIdPtr   [MAX_LAYERS];
-#endif
   string*    cfg_scaledRefLayerLeftOffsetPtr   [MAX_LAYERS];
   string*    cfg_scaledRefLayerTopOffsetPtr    [MAX_LAYERS];
@@ -898 +893 @@
     for(Int i = 0; i < MAX_LAYERS; i++)
     {
-#if O0098_SCALED_REF_LAYER_ID
       cfg_refLocationOffsetLayerIdPtr  [layer] = &cfg_refLocationOffsetLayerId[layer];
-#endif
       cfg_scaledRefLayerLeftOffsetPtr  [layer] = &cfg_scaledRefLayerLeftOffset[layer];
       cfg_scaledRefLayerTopOffsetPtr   [layer] = &cfg_scaledRefLayerTopOffset[layer];
@@ -1120 +1113 @@
 #endif
   ("NumRefLocationOffsets%d",                       cfg_numRefLayerLocationOffsets,              0, MAX_LAYERS,  "Number of reference layer offset sets ")
-#if O0098_SCALED_REF_LAYER_ID
   ("RefLocationOffsetLayerId%d",                    cfg_refLocationOffsetLayerIdPtr,    string(""), MAX_LAYERS, "Layer ID of reference location offset")
-#endif                                             
   ("ScaledRefLayerLeftOffset%d",                    cfg_scaledRefLayerLeftOffsetPtr,    string(""), MAX_LAYERS, "Horizontal offset of top-left luma sample of scaled base layer picture with respect to"
                                                                                                                 " top-left luma sample of the EL picture, in units of two luma samples")
@@ -1131 +1122 @@
   ("ScaledRefLayerBottomOffset%d",                  cfg_scaledRefLayerBottomOffsetPtr,  string(""), MAX_LAYERS, "Vertical offset of bottom-right luma sample of scaled base layer picture with respect to"
                                                                                                                 "  bottom-right luma sample of the EL picture, in units of two luma samples")
-#if SVC_EXTENSION
   ("ScaledRefLayerOffsetPresentFlag%d",         cfg_scaledRefLayerOffsetPresentFlagPtr, string(""), MAX_LAYERS, "presense flag of scaled reference layer offsets")
   ("RefRegionOffsetPresentFlag%d",                  cfg_refRegionOffsetPresentFlagPtr,  string(""), MAX_LAYERS, "presense flag of reference region offsets")
@@ -1147 +1137 @@
   ("PhaseHorChroma%d",                              cfg_phaseHorChromaPtr,              string(""), MAX_LAYERS, "chroma shift in the horizontal direction used in resampling proces")
   ("PhaseVerChroma%d",                              cfg_phaseVerChromaPtr,              string(""), MAX_LAYERS, "chroma shift in the vertical   direction used in resampling proces")
-#endif
 #if Q0074_COLOUR_REMAPPING_SEI
   ("SEIColourRemappingInfoFileRoot%d",              cfg_colourRemapSEIFileRoot,           string(""), MAX_LAYERS, "Colour Remapping Information SEI parameters file name for layer %d")
@@ -2096 +2085 @@
     if(m_acLayerCfg[layer].m_numRefLayerLocationOffsets)
     {
-#if O0098_SCALED_REF_LAYER_ID
       assert( strcmp(cfg_refLocationOffsetLayerId[layer].c_str(),  ""));
-#endif
+
       Bool srloFlag =
         strcmp(cfg_scaledRefLayerLeftOffset   [layer].c_str(), "") ||
@@ -2121 +2109 @@
     Int *tempArray = NULL;   // Contain the value 
 
-#if O0098_SCALED_REF_LAYER_ID
     // ID //
     if(strcmp(cfg_refLocationOffsetLayerId[layer].c_str(),  ""))
@@ -2135 +2122 @@
       }
     }
-#endif
 
     // Presense Flag //

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

@@ -65 +65 @@
   m_aiPad[1] = m_aiPad[0] = 0;
   m_numRefLayerLocationOffsets = 0;
-#if O0098_SCALED_REF_LAYER_ID
   ::memset(m_refLocationOffsetLayerId,   0, sizeof(m_refLocationOffsetLayerId));
-#endif
   ::memset(m_scaledRefLayerLeftOffset,   0, sizeof(m_scaledRefLayerLeftOffset));
   ::memset(m_scaledRefLayerTopOffset,    0, sizeof(m_scaledRefLayerTopOffset));

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -94 +94 @@
   TAppEncCfg* m_cAppEncCfg;                                   ///< pointer to app encoder config
   Int       m_numRefLayerLocationOffsets;
-#if O0098_SCALED_REF_LAYER_ID
   Int       m_refLocationOffsetLayerId  [MAX_LAYERS];
-#endif
   Int       m_scaledRefLayerLeftOffset  [MAX_LAYERS];
   Int       m_scaledRefLayerTopOffset   [MAX_LAYERS];

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

@@ -766 +766 @@
       for(Int i = 0; i < m_acLayerCfg[layer].m_numRefLayerLocationOffsets; i++)
       {
-#if O0098_SCALED_REF_LAYER_ID
         m_acTEncTop[layer].setRefLocationOffsetLayerId          (i, m_acLayerCfg[layer].m_refLocationOffsetLayerId[i]);
-#endif
         m_acTEncTop[layer].setScaledRefLayerOffsetPresentFlag   ( i, m_acLayerCfg[layer].m_scaledRefLayerOffsetPresentFlag[i] );
         m_acTEncTop[layer].getScaledRefLayerWindow(i).setWindow ( subWidthC  * m_acLayerCfg[layer].m_scaledRefLayerLeftOffset[i], subWidthC  * m_acLayerCfg[layer].m_scaledRefLayerRightOffset[i],