Changeset 833 in 3DVCSoftware for trunk/source/App


Ignore:
Timestamp:
7 Feb 2014, 20:31:12 (11 years ago)
Author:
tech
Message:

Merged 9.3-dev0@831.

Location:
trunk/source/App/TAppEncoder
Files:
3 edited

Legend:

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

    r773 r833  
    513513  ("SubPULog2Size", m_iSubPULog2Size, (Int)3, "Sub-PU size index: 2^n")
    514514#endif
    515 
     515#if QC_SPIVMP_MPI_G0119
     516  ("SubPUMPILog2Size", m_iSubPUMPILog2Size, (Int)3, "Sub-PU MPI size index: 2^n")
     517#endif
    516518#if H_3D_IC
    517519  ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
     
    519521#if H_3D_INTER_SDC
    520522  ("InterSDC",                 m_bDepthInterSDCFlag,        true, "Enable depth inter SDC")
     523#endif
     524#if H_3D_DBBP
     525  ("DBBP",                     m_bUseDBBP,   true, "Enable depth-based block partitioning" )
    521526#endif
    522527#if H_3D_IV_MERGE
     
    15131518#endif
    15141519#if H_3D_SPIVMP
     1520#if SEC_SPIVMP_MCP_SIZE_G0077
     1521  xConfirmPara( m_iSubPULog2Size < 3,                                        "SubPULog2Size must be 3 or greater.");
     1522#else
    15151523  xConfirmPara( m_iSubPULog2Size < 2,                                        "SubPULog2Size must be 2 or greater.");
     1524#endif
    15161525  xConfirmPara( m_iSubPULog2Size > 6,                                        "SubPULog2Size must be 6 or smaller.");
    15171526  xConfirmPara( (1<<m_iSubPULog2Size) > m_uiMaxCUWidth,                      "SubPULog2Size must be log2(maxCUSize) or smaller.");
     1527#endif
     1528#if QC_SPIVMP_MPI_G0119
     1529  xConfirmPara( m_iSubPUMPILog2Size < 3,                                        "SubPUMPILog2Size must be 3 or greater.");
     1530  xConfirmPara( m_iSubPUMPILog2Size > 6,                                        "SubPUMPILog2Size must be 6 or smaller.");
     1531  xConfirmPara( ( 1 << m_iSubPUMPILog2Size ) > m_uiMaxCUWidth,                  "SubPUMPILog2Size must be log2(maxCUSize) or smaller.");
    15181532#endif
    15191533#if ADAPTIVE_QP_SELECTION
     
    24742488#endif
    24752489#endif
     2490#if QC_SPIVMP_MPI_G0119
     2491  printf(" SubPUMPILog2Size:%d  " , m_iSubPUMPILog2Size  );
     2492#endif
    24762493#if H_3D_ARP
    24772494  printf(" ARP:%d  ", m_uiUseAdvResPred  );
    24782495#endif
    24792496#if H_3D_IC
    2480   printf( "IlluCompEnable: %d ", m_abUseIC);
     2497  printf( "IlluCompEnable:%d ", m_abUseIC);
    24812498#endif
    24822499#if H_3D_NBDV_REF
     
    24952512#endif
    24962513#if H_3D_INTER_SDC
    2497   printf( "interSDC: %d ", m_bDepthInterSDCFlag ? 1 : 0 );
     2514  printf( "interSDC:%d ", m_bDepthInterSDCFlag ? 1 : 0 );
     2515#endif
     2516#if H_3D_DBBP
     2517  printf("DBBP:%d ", m_bUseDBBP ? 1 : 0);
    24982518#endif
    24992519#if H_3D_IV_MERGE
    2500   printf( "MPI: %d ", m_bMPIFlag ? 1 : 0 );
     2520  printf( "MPI:%d ", m_bMPIFlag ? 1 : 0 );
    25012521#endif
    25022522  printf("\n\n"); 
  • trunk/source/App/TAppEncoder/TAppEncCfg.h

    r773 r833  
    130130  Int                    m_iSubPULog2Size;                   
    131131#endif
     132#endif
     133#if QC_SPIVMP_MPI_G0119
     134  Int                    m_iSubPUMPILog2Size;                   
    132135#endif
    133136#if H_3D_ARP                                                  /// < flag and number of weighting factors in ARP
     
    489492  Bool m_bDepthInterSDCFlag;                                ///< flag for inter SDC of depth map coding
    490493#endif
     494#if H_3D_DBBP
     495  Bool      m_bUseDBBP;                                     ///< flag for depth-based block partitioning
     496#endif
    491497#if H_3D_IV_MERGE
    492498  Bool m_bMPIFlag;                                           ///< flag for MPI of depth map coding
  • trunk/source/App/TAppEncoder/TAppEncTop.cpp

    r773 r833  
    185185    m_cTEncTop.setSubPULog2Size                 (( isDepth || 0==layerIdInVps ) ? 0 : m_iSubPULog2Size   );
    186186#endif
     187#if QC_SPIVMP_MPI_G0119
     188    m_cTEncTop.setSubPUMPILog2Size              ( !isDepth ? 0 : m_iSubPUMPILog2Size   );
     189#endif
    187190#if H_3D_IC
    188191    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
     
    201204#if H_3D_INTER_SDC
    202205    m_cTEncTop.setInterSDCEnable               ( isDepth ? m_bDepthInterSDCFlag    : false );
     206#endif
     207#if H_3D_DBBP
     208    m_cTEncTop.setUseDBBP                      ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_bUseDBBP );
    203209#endif
    204210#if H_3D_IV_MERGE
     
    911917          }
    912918#endif
     919
     920#if MTK_DDD_G0063
     921          m_acTEncTopList[ layer ]->getSliceEncoder()->setDDDPar( m_cCameraData.getCodedScale()[0][ m_acTEncTopList[layer]->getViewIndex() ],
     922              m_cCameraData.getCodedOffset()[0][ m_acTEncTopList[layer]->getViewIndex() ],
     923              m_cCameraData.getCamParsCodedPrecision() );
     924#endif
    913925        Int   iNumEncoded = 0;
    914926
     
    19031915#if H_3D_VSP
    19041916    vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && m_viewSynthesisPredFlag );         
    1905 #endif     
     1917#endif
     1918#if H_3D_DBBP
     1919    vps.setUseDBBP              ( layer, !isLayerZero && !isDepth && m_bUseDBBP );
     1920#endif
    19061921#if H_3D_INTER_SDC
    19071922    vps.setInterSDCFlag( layer, !isLayerZero && isDepth && m_bDepthInterSDCFlag );
     
    19111926#endif
    19121927  } 
     1928#if QC_SPIVMP_MPI_G0119
     1929  vps.setSubPUMPILog2Size( m_iSubPUMPILog2Size );
     1930#endif
    19131931#if H_3D
    19141932  vps.setIvMvScalingFlag( m_ivMvScalingFlag );   
Note: See TracChangeset for help on using the changeset viewer.