Changeset 574 in SHVCSoftware for branches/SHM-5.0-dev/source/App


Ignore:
Timestamp:
28 Jan 2014, 19:40:20 (11 years ago)
Author:
seregin
Message:

move IL WP setting into the config file

Location:
branches/SHM-5.0-dev/source/App/TAppEncoder
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r567 r574  
    587587#endif
    588588#if N0147_IRAP_ALIGN_FLAG
    589     ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" ) 
     589  ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" ) 
     590#endif
     591#if O0194_WEIGHTED_PREDICTION_CGS
     592  ("InterLayerWeightedPred", m_useInterLayerWeightedPred, false, "enable IL WP parameters estimation at encoder" ) 
    590593#endif
    591594#if AVC_BASE
     
    23472350  printf("Cross layer IRAP alignment    : %d\n", m_crossLayerIrapAlignFlag );
    23482351#endif
     2352#if O0194_WEIGHTED_PREDICTION_CGS
     2353  printf("InterLayerWeightedPred        : %d\n", m_useInterLayerWeightedPred );
     2354#endif
    23492355  for(UInt layer=0; layer<m_numLayers; layer++)
    23502356  {
     
    24922498  printf("O0194_DIFFERENT_BITDEPTH_EL_BL: %d ", O0194_DIFFERENT_BITDEPTH_EL_BL);
    24932499  printf("O0194_JOINT_US_BITSHIFT: %d ", O0194_JOINT_US_BITSHIFT);
    2494   printf("O0194_WEIGHTED_PREDICTION_CGS: %d ",O0194_WEIGHTED_PREDICTION_CGS);
    24952500#else
    24962501  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.h

    r567 r574  
    381381#endif
    382382#if O0215_PHASE_ALIGNMENT
    383   Bool m_phaseAlignFlag;
     383  Bool      m_phaseAlignFlag;
    384384#endif
    385385#if O0223_PICTURE_TYPES_ALIGN_FLAG
    386   Bool m_crossLayerPictureTypeAlignFlag;
     386  Bool      m_crossLayerPictureTypeAlignFlag;
    387387#endif
    388388#if N0147_IRAP_ALIGN_FLAG
    389   Bool m_crossLayerIrapAlignFlag;
     389  Bool      m_crossLayerIrapAlignFlag;
    390390#endif
    391391#if O0149_CROSS_LAYER_BLA_FLAG
    392   bool      m_crossLayerBLAFlag;
     392  Bool      m_crossLayerBLAFlag;
     393#endif
     394#if O0194_WEIGHTED_PREDICTION_CGS
     395  Bool      m_useInterLayerWeightedPred;
    393396#endif
    394397public:
  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r573 r574  
    178178#endif
    179179
    180 #if O0194_WEIGHTED_PREDICTION_CGS
    181   Bool bitDepthScalabilityFlag = false;
    182   for(UInt layer=0; layer<m_numLayers; layer++)
    183   {
    184     if( m_acLayerCfg[0].m_internalBitDepthY != m_acLayerCfg[layer].m_internalBitDepthY )
    185     {
    186       bitDepthScalabilityFlag = true;
    187       break;
    188     }
    189   }
    190 #endif
    191 
    192180  for(UInt layer=0; layer<m_numLayers; layer++)
    193181  {
     
    205193
    206194#if O0194_WEIGHTED_PREDICTION_CGS
    207     m_acTEncTop[layer].setBitDepthScalabilityFlag( bitDepthScalabilityFlag );
     195    m_acTEncTop[layer].setInterLayerWeightedPredFlag( m_useInterLayerWeightedPred );
    208196#endif
    209197#endif
Note: See TracChangeset for help on using the changeset viewer.