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


Ignore:
Timestamp:
30 Nov 2013, 12:29:49 (10 years ago)
Author:
tech
Message:

Merged HTM-8.2-dev0@723.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppEncoder/TAppEncCfg.cpp

    r655 r724  
    378378#if H_3D_DIM
    379379  ("DMM",                   m_useDMM,           true,  "Depth intra model modes")
     380#if !SEC_DMM3_RBC_F0147
    380381  ("RBC",                   m_useRBC,           true,  "Region boundary chain mode")
     382#endif
    381383  ("SDC",                   m_useSDC,           true,  "Simplified depth coding")
    382384  ("DLT",                   m_useDLT,           true,  "Depth lookup table")
     
    508510  ("AdvMultiviewResPred",      m_uiUseAdvResPred,           (UInt)1, "Usage of Advanced Residual Prediction" )
    509511#endif
     512#if MTK_SPIVMP_F0110
     513  ("SubPULog2Size", m_iSubPULog2Size, (Int)3, "Sub-PU size index: 2^n")
     514#endif
     515
    510516#if H_3D_IC
     517#if SEC_ONLY_TEXTURE_IC_F0151
     518  ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
     519#else
    511520  ("IlluCompEnable",           m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation")
     521#endif
    512522#endif
    513523#if H_3D_INTER_SDC
    514524  ("InterSDC",                 m_bDepthInterSDCFlag,        true, "Enable depth inter SDC")
     525#endif
     526#if SEC_MPI_ENABLING_MERGE_F0150
     527  ("MPI",                      m_bMPIFlag,        true, "Enable MPI")
    515528#endif
    516529  // Coding tools
     
    750763#endif
    751764#if H_3D_IV_MERGE
     765#if QC_DEPTH_IV_MRG_F0125 
     766  ("IvMvPred",                        m_ivMvPredFlag            , std::vector<Bool>(2, true)            , "inter view motion prediction " )
     767#else
    752768  ("IvMvPred",                        m_ivMvPredFlag,           true            , "inter view motion prediction " ) 
     769#endif
    753770#endif
    754771#if H_3D_NBDV_REF
     
    14731490#if H_3D_ARP
    14741491  xConfirmPara( ( 0 != m_uiUseAdvResPred ) &&  ( 1 != m_uiUseAdvResPred ), "UseAdvResPred must be 0 or 1." );
     1492#endif
     1493#if MTK_SPIVMP_F0110
     1494  xConfirmPara( m_iSubPULog2Size < 2,                                        "SubPULog2Size must be 2 or greater.");
     1495  xConfirmPara( m_iSubPULog2Size > 6,                                        "SubPULog2Size must be 6 or smaller.");
     1496  xConfirmPara( (1<<m_iSubPULog2Size) > m_uiMaxCUWidth,                      "SubPULog2Size must be log2(maxCUSize) or smaller.");
    14751497#endif
    14761498#if ADAPTIVE_QP_SELECTION
     
    24142436#endif
    24152437#if H_3D_IV_MERGE
     2438#if QC_DEPTH_IV_MRG_F0125
     2439  printf("IvMvPred:%d %d", m_ivMvPredFlag[0] ? 1 : 0, m_ivMvPredFlag[1] ? 1 : 0);
     2440#else
    24162441  printf("IvMvPred:%d ", m_ivMvPredFlag );
     2442#endif
     2443#if MTK_SPIVMP_F0110
     2444  printf(" SubPULog2Size:%d  " , m_iSubPULog2Size  );
     2445#endif
    24172446#endif
    24182447#if H_3D_ARP
     
    24202449#endif
    24212450#if H_3D_IC
     2451#if SEC_ONLY_TEXTURE_IC_F0151
     2452  printf( "IlluCompEnable: %d ", m_abUseIC);
     2453#else
    24222454  printf( "IlluCompEnable: %d %d ", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0 );
     2455#endif
    24232456#endif
    24242457#if H_3D_NBDV_REF
     
    24332466#if H_3D_DIM
    24342467  printf("DMM:%d ", m_useDMM );
     2468#if !SEC_DMM3_RBC_F0147
    24352469  printf("RBC:%d ", m_useRBC );
     2470#endif
    24362471  printf("SDC:%d ", m_useSDC );
    24372472  printf("DLT:%d ", m_useDLT );
     
    24392474#if H_3D_INTER_SDC
    24402475  printf( "interSDC: %d ", m_bDepthInterSDCFlag ? 1 : 0 );
     2476#endif
     2477#if SEC_MPI_ENABLING_MERGE_F0150
     2478  printf( "MPI: %d ", m_bMPIFlag ? 1 : 0 );
    24412479#endif
    24422480  printf("\n\n"); 
Note: See TracChangeset for help on using the changeset viewer.