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

Timestamp:

8 Jul 2015, 20:30:17 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0194_WEIGHTED_PREDICTION_CGS

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (3 diffs)

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

@@ -1129 +1129 @@
   ("CrossLayerIrapAlignFlag",                        m_crossLayerIrapAlignFlag,                          true, "align IRAP across layers" )  
   ("CrossLayerAlignedIdrOnlyFlag",                   m_crossLayerAlignedIdrOnlyFlag,                     true, "only idr for IRAP across layers" )  
-#if O0194_WEIGHTED_PREDICTION_CGS
   ("InterLayerWeightedPred",                          m_useInterLayerWeightedPred,                       false, "enable IL WP parameters estimation at encoder" )  
-#endif
 #if AVC_BASE
   ("NonHEVCBase,-nonhevc",                            m_nonHEVCBaseLayerFlag,                                0, "BL is available but not internal")
@@ -4344 +4342 @@
   printf("Cross layer IRAP alignment        : %d\n", m_crossLayerIrapAlignFlag );
   printf("IDR only for IRAP                 : %d\n", m_crossLayerAlignedIdrOnlyFlag );
-#if O0194_WEIGHTED_PREDICTION_CGS
   printf("InterLayerWeightedPred            : %d\n", m_useInterLayerWeightedPred );
-#endif
   printf("\n");
   for(UInt layer=0; layer<m_numLayers; layer++)

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

@@ -510 +510 @@
   Bool      m_crossLayerAlignedIdrOnlyFlag;
   Bool      m_crossLayerBLAFlag;
-#if O0194_WEIGHTED_PREDICTION_CGS
   Bool      m_useInterLayerWeightedPred;
-#endif
 #if Q0048_CGS_3D_ASYMLUT
   Int       m_nCGSFlag;

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

@@ -228 +228 @@
     g_bitDepthLayer[CHANNEL_TYPE_CHROMA][m_acLayerCfg[layer].m_layerId] = g_bitDepth[CHANNEL_TYPE_CHROMA];
 
-#if O0194_WEIGHTED_PREDICTION_CGS
     m_acTEncTop[layer].setInterLayerWeightedPredFlag                      ( m_useInterLayerWeightedPred );
-#endif
     
     Int layerPTLIdx = m_acLayerCfg[layer].m_layerPTLIdx;
@@ -503 +501 @@
     m_acTEncTop[layer].setUseFastIntraScalable                             ( m_useFastIntraScalable );
 #endif
-#if O0194_WEIGHTED_PREDICTION_CGS
+
     if( layer != 0 && m_useInterLayerWeightedPred )
     {
@@ -510 +508 @@
       m_acTEncTop[layer].setWPBiPred                                        ( true   );
     }
-#endif
+
     //====== Parallel Merge Estimation ========
     m_acTEncTop[layer].setLog2ParallelMergeLevelMinus2                      ( m_log2ParallelMergeLevel - 2 );