Changeset 939 in 3DVCSoftware for branches/HTM-10.2-dev0/source/App


Ignore:
Timestamp:
22 Apr 2014, 17:08:54 (11 years ago)
Author:
tech
Message:

Merged 10.2-dev3-HiSilicon@928.

Location:
branches/HTM-10.2-dev0/source/App/TAppEncoder
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-10.2-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r884 r939  
    517517#if H_3D_IC
    518518  ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
     519#if MTK_LOW_LATENCY_IC_ENCODING_H0086
     520  ("IlluCompLowLatencyEnc",    m_bUseLowLatencyICEnc, false, "Enable low-latency illumination compensation encoding")
     521#endif
    519522#endif
    520523#if H_3D_INTER_SDC
     
    24792482#if H_3D_IC
    24802483  printf( "IlluCompEnable:%d ", m_abUseIC);
     2484#if MTK_LOW_LATENCY_IC_ENCODING_H0086
     2485  printf ("IlluCompLowLatencyEnc:%d ",  m_bUseLowLatencyICEnc);
     2486#endif
    24812487#endif
    24822488#if H_3D_NBDV_REF
  • branches/HTM-10.2-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r884 r939  
    137137#if H_3D_IC
    138138  Bool   m_abUseIC;
     139#if MTK_LOW_LATENCY_IC_ENCODING_H0086
     140  Bool  m_bUseLowLatencyICEnc;
     141#endif
    139142#endif
    140143#if H_3D_NBDV_REF
  • branches/HTM-10.2-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r884 r939  
    178178    m_cTEncTop.setDWeight                      ( isDepth ? m_iDWeight             : 0     );
    179179#endif // H_3D_VSO
    180 #if H_3D_ARP
    181180    //====== Advanced Inter-view Residual Prediction =========
    182181    m_cTEncTop.setUseAdvRP                     ( ( isDepth || 0==layerIdInVps ) ? 0 : m_uiUseAdvResPred );
     
    189188#if H_3D_IC
    190189    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
     190#if MTK_LOW_LATENCY_IC_ENCODING_H0086
     191    m_cTEncTop.setUseICLowLatencyEnc           ( m_bUseLowLatencyICEnc );
     192#endif
    191193#endif
    192194  //========== Depth intra modes ==========
     
    17931795
    17941796#if H_3D_ARP
     1797#if QC_IV_PRED_CONSTRAINT_H0137
     1798    vps.setUseAdvRP        ( layer, ( isDepth || isLayerZero || !vps.getNumDirectRefLayers(layer) ) ? 0 : m_uiUseAdvResPred );
     1799    vps.setARPStepNum      ( layer, ( isDepth || isLayerZero || !vps.getNumDirectRefLayers(layer) ) ? 1 : H_3D_ARP_WFNR     );
     1800#else
    17951801    vps.setUseAdvRP        ( layer, ( isDepth || isLayerZero ) ? 0 : m_uiUseAdvResPred );
    17961802    vps.setARPStepNum      ( layer, ( isDepth || isLayerZero ) ? 1 : H_3D_ARP_WFNR     );
    17971803#endif 
     1804#endif 
    17981805#if H_3D_SPIVMP
    17991806    if( isDepth )
     
    18121819
    18131820#if H_3D_IV_MERGE
     1821#if QC_IV_PRED_CONSTRAINT_H0137
     1822    if( !vps.getNumDirectRefLayers(layer) )
     1823    {
     1824      vps.setIvMvPredFlag    (layer, false);
     1825    }
     1826    else
     1827    {
     1828#endif
    18141829    if( isDepth )
    18151830    {
     
    18201835      vps.setIvMvPredFlag         ( layer, !isLayerZero && m_ivMvPredFlag[0] );
    18211836    }
     1837#if QC_IV_PRED_CONSTRAINT_H0137
     1838    }
     1839#endif
    18221840#endif
    18231841#if H_3D_NBDV_REF
     
    18251843#endif
    18261844#if H_3D_VSP
     1845#if QC_IV_PRED_CONSTRAINT_H0137
     1846    vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && vps.getNumDirectRefLayers(layer) && m_viewSynthesisPredFlag );         
     1847#else
    18271848    vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && m_viewSynthesisPredFlag );         
     1849#endif
    18281850#endif
    18291851#if H_3D_DBBP
Note: See TracChangeset for help on using the changeset viewer.