Changeset 773 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.cpp


Ignore:
Timestamp:
16 Jan 2014, 09:56:13 (10 years ago)
Author:
tech
Message:

Merged branch/9.2-dev0@722.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/App/TAppEncoder/TAppEncCfg.cpp

    r738 r773  
    378378#if H_3D_DIM
    379379  ("DMM",                   m_useDMM,           true,  "Depth intra model modes")
    380 #if !SEC_DMM3_RBC_F0147
    381   ("RBC",                   m_useRBC,           true,  "Region boundary chain mode")
    382 #endif
    383380  ("SDC",                   m_useSDC,           true,  "Simplified depth coding")
    384381  ("DLT",                   m_useDLT,           true,  "Depth lookup table")
    … …  
    391388  ("VpsNumLayerSets",       m_vpsNumLayerSets    , 1                    , "Number of layer sets")   
    392389  ("LayerIdsInSet_%d",      m_layerIdsInSets     , std::vector<Int>(1,0), MAX_VPS_OP_SETS_PLUS1 ,"LayerIds of Layer set") 
    393 #if H_MV_6_PS_0109_25
    394390  ("DefaultOneTargetOutputLayerFlag"  , m_defaultOneTargetOutputLayerIdc  , 0, "Output highest layer of layer sets by default")
    395 #else
    396   ("DefaultOneTargetOutputLayerFlag", m_defaultOneTargetOutputLayerFlag,  false , "Output highest layer of layer sets by default")     
    397 #endif
    398391  ("OutputLayerSetIdx",     m_outputLayerSetIdx  , std::vector<Int>(0,0), "Indices of layer sets used as additional output layer sets") 
    399392  ("LayerIdsInAddOutputLayerSet_%d", m_layerIdsInAddOutputLayerSet      , std::vector<Int>(1,0), MAX_VPS_ADD_OUTPUT_LAYER_SETS, "LayerIds of additional output layers") 
    … …  
    451444  ("QuadtreeTUMaxDepthIntra", m_uiQuadtreeTUMaxDepthIntra, 1u, "Depth of TU tree for intra CUs")
    452445  ("QuadtreeTUMaxDepthInter", m_uiQuadtreeTUMaxDepthInter, 2u, "Depth of TU tree for inter CUs")
    453  
    454446  // Coding structure parameters
    455 #if H_MV_LAYER_WISE_STARTUP
     447#if H_MV 
    456448  ("IntraPeriod,-ip",         m_iIntraPeriod,std::vector<Int>(1,-1), "Intra period in frames, (-1: only first frame), per layer")
    457449#else
    458   ("IntraPeriod,-ip",         m_iIntraPeriod,              -1, "Intra period in frames, (-1: only first frame)")
     450("IntraPeriod,-ip",         m_iIntraPeriod,              -1, "Intra period in frames, (-1: only first frame)")
    459451#endif
    460452  ("DecodingRefreshType,-dr", m_iDecodingRefreshType,       0, "Intra refresh type (0:none 1:CRA 2:IDR)")
    … …  
    518510  ("AdvMultiviewResPred",      m_uiUseAdvResPred,           (UInt)1, "Usage of Advanced Residual Prediction" )
    519511#endif
    520 #if MTK_SPIVMP_F0110
     512#if H_3D_SPIVMP
    521513  ("SubPULog2Size", m_iSubPULog2Size, (Int)3, "Sub-PU size index: 2^n")
    522514#endif
    523515
    524516#if H_3D_IC
    525 #if SEC_ONLY_TEXTURE_IC_F0151
    526517  ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
    527 #else
    528   ("IlluCompEnable",           m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation")
    529 #endif
    530518#endif
    531519#if H_3D_INTER_SDC
    532520  ("InterSDC",                 m_bDepthInterSDCFlag,        true, "Enable depth inter SDC")
    533521#endif
    534 #if SEC_MPI_ENABLING_MERGE_F0150
     522#if H_3D_IV_MERGE
    535523  ("MPI",                      m_bMPIFlag,        true, "Enable MPI")
    536524#endif
    … …  
    633621#if H_MV
    634622
    635 #if H_MV_6_HRD_O0217_13
    636623  // DBP Size
    637624  ("SubLayerFlagInfoPresentFlag",  m_subLayerFlagInfoPresentFlag , false                                           , "SubLayerFlagInfoPresentFlag")
    638 #endif
    639625  // VPS VUI
    640626  ("VpsVuiPresentFlag"           , m_vpsVuiPresentFlag           , false                                           , "VpsVuiPresentFlag           ")
    641 #if H_MV_6_PS_O0223_29
    642627  ("CrossLayerPicTypeAlignedFlag", m_crossLayerPicTypeAlignedFlag, false                                           , "CrossLayerPicTypeAlignedFlag")  // Could actually be derived by the encoder
    643628  ("CrossLayerIrapAlignedFlag"   , m_crossLayerIrapAlignedFlag   , false                                           , "CrossLayerIrapAlignedFlag   ")  // Could actually be derived by the encoder
    644 #endif
    645629  ("BitRatePresentVpsFlag"       , m_bitRatePresentVpsFlag       , false                                           , "BitRatePresentVpsFlag       ")
    646630  ("PicRatePresentVpsFlag"       , m_picRatePresentVpsFlag       , false                                           , "PicRatePresentVpsFlag       ")
    … …  
    651635  ("ConstantPicRateIdc"          , m_constantPicRateIdc          , std::vector< Int  >(1,0)  ,MAX_VPS_OP_SETS_PLUS1, "ConstantPicRateIdc per sub layer for the N-th layer set")
    652636  ("AvgPicRate"                  , m_avgPicRate                  , std::vector< Int  >(1,0)  ,MAX_VPS_OP_SETS_PLUS1, "AvgPicRate         per sub layer for the N-th layer set")
    653 #if H_MV_6_O0226_37
    654637  ("TilesNotInUseFlag"            , m_tilesNotInUseFlag            , true                                          , "TilesNotInUseFlag            ")
    655638  ("TilesInUseFlag"               , m_tilesInUseFlag               , std::vector< Bool >(1,false)                   , "TilesInUseFlag               ")
    … …  
    657640  ("WppNotInUseFlag"              , m_wppNotInUseFlag              , true                                          , "WppNotInUseFlag              ")
    658641  ("WppInUseFlag"                 , m_wppInUseFlag                 , std::vector< Bool >(1,0)                      , "WppInUseFlag                 ")
    659 #endif
    660642  ("TileBoundariesAlignedFlag"   , m_tileBoundariesAlignedFlag   , std::vector< Bool >(1,0)  ,MAX_NUM_LAYERS       , "TileBoundariesAlignedFlag    per direct reference for the N-th layer")
    661643  ("IlpRestrictedRefLayersFlag"  , m_ilpRestrictedRefLayersFlag  , false                                           , "IlpRestrictedRefLayersFlag")
    … …  
    787769#endif
    788770#if H_3D_IV_MERGE
    789 #if QC_DEPTH_IV_MRG_F0125 
    790771  ("IvMvPred",                        m_ivMvPredFlag            , std::vector<Bool>(2, true)            , "inter view motion prediction " )
    791 #else
    792   ("IvMvPred",                        m_ivMvPredFlag,           true            , "inter view motion prediction " ) 
    793 #endif
    794772#endif
    795773#if H_3D_NBDV_REF
    … …  
    10741052  xResizeVector( m_bLoopFilterDisable );
    10751053  xResizeVector( m_bUseSAO );
    1076 #if H_MV_LAYER_WISE_STARTUP
    10771054  xResizeVector( m_iIntraPeriod );
    1078 #endif
    1079 #if H_MV_6_O0226_37
    10801055  xResizeVector( m_tilesInUseFlag );
    10811056  xResizeVector( m_loopFilterNotAcrossTilesFlag );
    10821057  xResizeVector( m_wppInUseFlag );
    1083 #endif
    10841058#else
    10851059  m_aidQP = new Int[ m_framesToBeEncoded + m_iGOPSize + 1 ];
    … …  
    14261400    for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++ )
    14271401    {
    1428 #if H_MV_6_LAYER_ID_32
    14291402      xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx].size() >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than and less than MAX_NUM_LAYER_IDS" );
    1430 #else
    1431       xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx].size() >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than and less than 64" );
    1432 #endif
    14331403    }
    14341404  }
    … …  
    14561426  }
    14571427
    1458 #if H_MV_6_PS_0109_25
    14591428  xConfirmPara( m_defaultOneTargetOutputLayerIdc < 0 || m_defaultOneTargetOutputLayerIdc > 1, "Default one target output layer idc must be equal to 0 or equal to 1" );
    1460 #endif
    14611429  xConfirmPara( m_profileLevelTierIdx.size() < m_vpsNumLayerSets + m_outputLayerSetIdx.size(), "The number of Profile Level Tier indices must be equal to the number of layer set plus the number of output layer set indices" );
    14621430
    … …  
    14751443  xConfirmPara( m_iGOPSize < 1 ,                                                            "GOP Size must be greater or equal to 1" );
    14761444  xConfirmPara( m_iGOPSize > 1 &&  m_iGOPSize % 2,                                          "GOP Size must be a multiple of 2, if GOP Size is greater than 1" );
    1477 #if H_MV_LAYER_WISE_STARTUP
     1445#if H_MV
    14781446  for( Int layer = 0; layer < m_numberOfLayers; layer++ )
    14791447  {
    … …  
    15081476  if (m_iDecodingRefreshType == 2)
    15091477  {
    1510 #if H_MV_LAYER_WISE_STARTUP
     1478#if H_MV
    15111479    for (Int i = 0; i < m_numberOfLayers; i++ )
    15121480    {
    … …  
    15441512  xConfirmPara( ( 0 != m_uiUseAdvResPred ) &&  ( 1 != m_uiUseAdvResPred ), "UseAdvResPred must be 0 or 1." );
    15451513#endif
    1546 #if MTK_SPIVMP_F0110
     1514#if H_3D_SPIVMP
    15471515  xConfirmPara( m_iSubPULog2Size < 2,                                        "SubPULog2Size must be 2 or greater.");
    15481516  xConfirmPara( m_iSubPULog2Size > 6,                                        "SubPULog2Size must be 6 or smaller.");
    … …  
    17741742  /* if this is an intra-only sequence, ie IntraPeriod=1, don't verify the GOP structure
    17751743   * This permits the ability to omit a GOP structure specification */
    1776 #if H_MV_LAYER_WISE_STARTUP
     1744#if H_MV
    17771745  if (m_iIntraPeriod[layer] == 1 && m_GOPList[0].m_POC == -1) {
    17781746#else
    … …  
    18031771  }
    18041772  Int numOK=0;
    1805 #if H_MV_LAYER_WISE_STARTUP
     1773#if H_MV
    18061774  xConfirmPara( m_iIntraPeriod[layer] >=0&&(m_iIntraPeriod[layer]%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" );
    18071775#else
    1808   xConfirmPara( m_iIntraPeriod >=0&&(m_iIntraPeriod%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" );
     1776xConfirmPara( m_iIntraPeriod >=0&&(m_iIntraPeriod%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" );
    18091777#endif
    18101778
    … …  
    18181786 
    18191787#if H_MV
    1820 #if H_MV_LAYER_WISE_STARTUP
    18211788  if ( (m_iIntraPeriod[layer] != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable[layer]) )
    1822 #else
    1823   if ( (m_iIntraPeriod != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable[layer]) )
    1824 #endif
    18251789#else
    18261790  if ( (m_iIntraPeriod != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable) )
    … …  
    23472311  printf("Min PCM size                 : %d\n", 1 << m_uiPCMLog2MinSize);
    23482312  printf("Motion search range          : %d\n", m_iSearchRange );
    2349 #if H_MV_LAYER_WISE_STARTUP
     2313#if H_MV
    23502314  xPrintParaVector( "Intra period", m_iIntraPeriod );
    23512315#else
    … …  
    25052469#endif
    25062470#if H_3D_IV_MERGE
    2507 #if QC_DEPTH_IV_MRG_F0125
    25082471  printf("IvMvPred:%d %d", m_ivMvPredFlag[0] ? 1 : 0, m_ivMvPredFlag[1] ? 1 : 0);
    2509 #else
    2510   printf("IvMvPred:%d ", m_ivMvPredFlag );
    2511 #endif
    2512 #if MTK_SPIVMP_F0110
     2472#if H_3D_SPIVMP
    25132473  printf(" SubPULog2Size:%d  " , m_iSubPULog2Size  );
    25142474#endif
    … …  
    25182478#endif
    25192479#if H_3D_IC
    2520 #if SEC_ONLY_TEXTURE_IC_F0151
    25212480  printf( "IlluCompEnable: %d ", m_abUseIC);
    2522 #else
    2523   printf( "IlluCompEnable: %d %d ", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0 );
    2524 #endif
    25252481#endif
    25262482#if H_3D_NBDV_REF
    … …  
    25352491#if H_3D_DIM
    25362492  printf("DMM:%d ", m_useDMM );
    2537 #if !SEC_DMM3_RBC_F0147
    2538   printf("RBC:%d ", m_useRBC );
    2539 #endif
    25402493  printf("SDC:%d ", m_useSDC );
    25412494  printf("DLT:%d ", m_useDLT );
    … …  
    25442497  printf( "interSDC: %d ", m_bDepthInterSDCFlag ? 1 : 0 );
    25452498#endif
    2546 #if SEC_MPI_ENABLING_MERGE_F0150
     2499#if H_3D_IV_MERGE
    25472500  printf( "MPI: %d ", m_bMPIFlag ? 1 : 0 );
    25482501#endif
Note: See TracChangeset for help on using the changeset viewer.