Ignore:
Timestamp:
31 Jan 2013, 08:40:24 (11 years ago)
Author:
mediatek-htm
Message:

Integration of JCT3V-C0129 (Release of DV Constraint without control flag)
The MACRO is MTK_RELEASE_DV_CONSTRAINT

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp

    r246 r247  
    56085608#if QC_SIMPLE_NBDV_B0047
    56095609  const Int iNumofDvMCP = 7;
     5610#if MTK_RELEASE_DV_CONSTRAINT
     5611  Int   aiDvMcpDvCandX[2][iNumofDvMCP] = {{0,},    {0,}}; // dummy, 5 spatial + 1 temporal
     5612  Int   aiDvMcpDvCandY[2][iNumofDvMCP] = {{0,},    {0,}}; // dummy, 5 spatial + 1 temporal
     5613#else
    56105614  Int   aiDvMcpDvCand[2][iNumofDvMCP] = {{0,},    {0,}}; // dummy, 5 spatial + 1 temporal
     5615#endif
    56115616  Bool  abDvMcpFlag  [2][iNumofDvMCP] = {{false,},{false,}};
    56125617#else
     
    60076012          if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
    60086013          {
     6014#if MTK_RELEASE_DV_CONSTRAINT
     6015            aiDvMcpDvCandX[iList][DVFROM_LEFT] = cTmpMvPred.m_iDvMcpDispX;
     6016            aiDvMcpDvCandY[iList][DVFROM_LEFT] = cTmpMvPred.m_iDvMcpDispY;
     6017#else
    60096018            aiDvMcpDvCand[iList][DVFROM_LEFT] = cTmpMvPred.m_iDvMcpDispX;
     6019#endif
    60106020            abDvMcpFlag  [iList][DVFROM_LEFT] = true;
    60116021            bDvMcpIsFound = true;
     
    60936103          if( cTmpMvPred.m_bDvMcp  && bTmpIsSkipped )
    60946104          {
     6105#if MTK_RELEASE_DV_CONSTRAINT
     6106            aiDvMcpDvCandX[iList][DVFROM_ABOVE] = cTmpMvPred.m_iDvMcpDispX;
     6107            aiDvMcpDvCandY[iList][DVFROM_ABOVE] = cTmpMvPred.m_iDvMcpDispY;
     6108#else
    60956109            aiDvMcpDvCand[iList][DVFROM_ABOVE] = cTmpMvPred.m_iDvMcpDispX;
     6110#endif
    60966111            abDvMcpFlag  [iList][DVFROM_ABOVE] = true;
    60976112            bDvMcpIsFound = true;
     
    61736188          if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
    61746189          {
     6190#if MTK_RELEASE_DV_CONSTRAINT
     6191            aiDvMcpDvCandX[iList][DVFROM_ABOVERIGHT] = cTmpMvPred.m_iDvMcpDispX;
     6192            aiDvMcpDvCandY[iList][DVFROM_ABOVERIGHT] = cTmpMvPred.m_iDvMcpDispY;
     6193#else
    61756194            aiDvMcpDvCand[iList][DVFROM_ABOVERIGHT] = cTmpMvPred.m_iDvMcpDispX;
     6195#endif
    61766196            abDvMcpFlag  [iList][DVFROM_ABOVERIGHT] = true;
    61776197            bDvMcpIsFound = true;
     
    62456265          if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
    62466266          {
     6267#if MTK_RELEASE_DV_CONSTRAINT
     6268            aiDvMcpDvCandX[iList][DVFROM_LEFTBELOW] = cTmpMvPred.m_iDvMcpDispX;
     6269            aiDvMcpDvCandY[iList][DVFROM_LEFTBELOW] = cTmpMvPred.m_iDvMcpDispY;
     6270#else
    62476271            aiDvMcpDvCand[iList][DVFROM_LEFTBELOW] = cTmpMvPred.m_iDvMcpDispX;
     6272#endif
    62486273            abDvMcpFlag  [iList][DVFROM_LEFTBELOW] = true;
    62496274            bDvMcpIsFound = true;
     
    63276352          if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
    63286353          {
     6354#if MTK_RELEASE_DV_CONSTRAINT
     6355            aiDvMcpDvCandX[iList][DVFROM_ABOVELEFT] = cTmpMvPred.m_iDvMcpDispX;
     6356            aiDvMcpDvCandY[iList][DVFROM_ABOVELEFT] = cTmpMvPred.m_iDvMcpDispY;
     6357#else
    63296358            aiDvMcpDvCand[iList][DVFROM_ABOVELEFT] = cTmpMvPred.m_iDvMcpDispX;
     6359#endif
    63306360            abDvMcpFlag  [iList][DVFROM_ABOVELEFT] = true;
    63316361            bDvMcpIsFound = true;
     
    66786708        if( abDvMcpFlag[iList][i]==true )
    66796709        {
     6710#if MTK_RELEASE_DV_CONSTRAINT
     6711          TComMv dv( aiDvMcpDvCandX[iList][ i ], aiDvMcpDvCandY[iList][ i ] );
     6712#else
    66806713          TComMv dv( aiDvMcpDvCand[iList][ i ], 0 );
     6714#endif
    66816715          clipMv( dv );
    66826716#if !MERL_MTK_VSP_DVP_REFINE_C0152_C0131
     
    88438877  else
    88448878  {
     8879#if MTK_RELEASE_DV_CONSTRAINT
     8880    Bool bAvailable = pcResidualGenerator->getResidualSamples( this, uiPartIdx, pcYuv, cDisInfo.m_acMvCand[0]
     8881#if QC_SIMPLIFIEDIVRP_M24938
     8882     , bRecon
     8883#endif
     8884     );
     8885#else
    88458886    Bool bAvailable = pcResidualGenerator->getResidualSamples( this, uiPartIdx, pcYuv, cDisInfo.m_acMvCand[0].getHor()
    88468887#if QC_SIMPLIFIEDIVRP_M24938
     
    88488889#endif
    88498890      );
     8891#endif
    88508892    m_pePartSize[0] = m_peSaved;
    88518893    return bAvailable;
Note: See TracChangeset for help on using the changeset viewer.