Changeset 32 in SHVCSoftware for branches/SHM-1.0-dev


Ignore:
Timestamp:
7 Feb 2013, 22:28:07 (12 years ago)
Author:
qualcomm
Message:

Clean up: convert all "tabs" to "spaces", liweig@…

Location:
branches/SHM-1.0-dev/source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-1.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r25 r32  
    9999
    100100#if REF_IDX_MFM
    101         if(layer == 0)
    102                 m_acTEncTop[layer].setMFMEnabledFlag(false);
    103         else
    104                 m_acTEncTop[layer].setMFMEnabledFlag(true);
     101  if(layer == 0)
     102    m_acTEncTop[layer].setMFMEnabledFlag(false);
     103  else
     104    m_acTEncTop[layer].setMFMEnabledFlag(true);
    105105#endif
    106106    // set layer ID

  • branches/SHM-1.0-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r23 r32  
    21462146Bool TComDataCU::xCheckZeroMVILRMerge(UChar uhInterDir, TComMvField& cMvFieldL0, TComMvField& cMvFieldL1)
    21472147{
    2148         Bool checkZeroMVILR = true;
    2149 
    2150         if(uhInterDir&0x1)  //list0
    2151         {
    2152                 Int refIdxL0 = cMvFieldL0.getRefIdx();
    2153                 if(getSlice()->getRefPic(REF_PIC_LIST_0, refIdxL0)->getIsILR())
    2154                         checkZeroMVILR &= (cMvFieldL0.getHor() == 0 && cMvFieldL0.getVer() == 0);
    2155         }
    2156         if(uhInterDir&0x2)  //list1
    2157         {
    2158                 Int refIdxL1  = cMvFieldL1.getRefIdx();
    2159                 if(getSlice()->getRefPic(REF_PIC_LIST_1, refIdxL1)->getIsILR())
    2160                         checkZeroMVILR &= (cMvFieldL1.getHor() == 0 && cMvFieldL1.getVer() == 0);
    2161         }
    2162 
    2163         return checkZeroMVILR;
     2148  Bool checkZeroMVILR = true;
     2149
     2150  if(uhInterDir&0x1)  //list0
     2151  {
     2152    Int refIdxL0 = cMvFieldL0.getRefIdx();
     2153    if(getSlice()->getRefPic(REF_PIC_LIST_0, refIdxL0)->getIsILR())
     2154      checkZeroMVILR &= (cMvFieldL0.getHor() == 0 && cMvFieldL0.getVer() == 0);
     2155  }
     2156  if(uhInterDir&0x2)  //list1
     2157  {
     2158    Int refIdxL1  = cMvFieldL1.getRefIdx();
     2159    if(getSlice()->getRefPic(REF_PIC_LIST_1, refIdxL1)->getIsILR())
     2160      checkZeroMVILR &= (cMvFieldL1.getHor() == 0 && cMvFieldL1.getVer() == 0);
     2161  }
     2162
     2163  return checkZeroMVILR;
    21642164}
    21652165
    21662166Bool TComDataCU::xCheckZeroMVILRMvdL1Zero(Int iRefList, Int iRefIdx, Int MvpIdx)
    21672167{
    2168         RefPicList eRefPicList = iRefList > 0? REF_PIC_LIST_1: REF_PIC_LIST_0;
    2169         assert(eRefPicList == REF_PIC_LIST_1);
    2170 
    2171         Bool checkZeroMVILR = true;
    2172 
    2173         if(getSlice()->getRefPic(eRefPicList, iRefIdx)->getIsILR())
    2174         {
    2175                 AMVPInfo* pcAMVPInfo = getCUMvField(eRefPicList)->getAMVPInfo();
    2176                 TComMv    cMv        = pcAMVPInfo->m_acMvCand[MvpIdx];
    2177                 checkZeroMVILR &= (cMv.getHor() == 0 && cMv.getVer() == 0);
    2178         }
    2179 
    2180         return checkZeroMVILR;
     2168  RefPicList eRefPicList = iRefList > 0? REF_PIC_LIST_1: REF_PIC_LIST_0;
     2169  assert(eRefPicList == REF_PIC_LIST_1);
     2170
     2171  Bool checkZeroMVILR = true;
     2172
     2173  if(getSlice()->getRefPic(eRefPicList, iRefIdx)->getIsILR())
     2174  {
     2175    AMVPInfo* pcAMVPInfo = getCUMvField(eRefPicList)->getAMVPInfo();
     2176    TComMv    cMv        = pcAMVPInfo->m_acMvCand[MvpIdx];
     2177    checkZeroMVILR &= (cMv.getHor() == 0 && cMv.getVer() == 0);
     2178  }
     2179
     2180  return checkZeroMVILR;
    21812181}
    21822182#endif

  • branches/SHM-1.0-dev/source/Lib/TLibCommon/TComPic.cpp

    r27 r32  
    594594
    595595
    596         Int iBWidth   = pcPicBase->getPicYuvRec()->getWidth () - pcPicBase->getPicYuvRec()->getPicCropLeftOffset() - pcPicBase->getPicYuvRec()->getPicCropRightOffset();
    597         Int iBHeight  = pcPicBase->getPicYuvRec()->getHeight() - pcPicBase->getPicYuvRec()->getPicCropTopOffset() - pcPicBase->getPicYuvRec()->getPicCropBottomOffset();
    598 
    599         Int iEWidth   = getPicYuvRec()->getWidth() -  getPicYuvRec()->getPicCropLeftOffset() - getPicYuvRec()->getPicCropRightOffset();
    600         Int iEHeight  = getPicYuvRec()->getHeight() - getPicYuvRec()->getPicCropTopOffset() -  getPicYuvRec()->getPicCropBottomOffset();
    601 
    602 
    603         UInt upSampleRatio = 0;
    604         if(iEWidth == iBWidth && iEHeight == iBHeight)
    605         {
    606                 upSampleRatio = 2;
    607         }
    608         else if(2*iEWidth == 3*iBWidth && 2*iEHeight == 3*iBHeight)
    609         {
    610                 upSampleRatio = 3;
    611         }
    612         else if(iEWidth == 2*iBWidth && iEHeight == 2*iBHeight)
    613         {
    614                 upSampleRatio = 4;
    615         }
    616         else
    617         {
    618                 assert(0);
    619         }
    620 
    621         for(UInt cuIdx = 0; cuIdx < getPicSym()->getNumberOfCUsInFrame(); cuIdx++)  //each LCU
    622         {
    623                 UInt uiNumPartitions   = 1<<(g_uiMaxCUDepth<<1);
    624 
    625                 TComDataCU*             pcCUDes = getCU(cuIdx);
    626 
    627                 UInt uiWidthMinPU      = g_uiMaxCUWidth/(1<<g_uiMaxCUDepth);
    628                 UInt uiHeightMinPU     = g_uiMaxCUHeight/(1<<g_uiMaxCUDepth);
    629                 Int unitNum = max (1, (Int)((16/uiWidthMinPU)*(16/uiHeightMinPU)) );
    630 
    631                 for(UInt uiAbsPartIdx = 0; uiAbsPartIdx < uiNumPartitions; uiAbsPartIdx+=unitNum )  //each 16x16 unit
    632                 {
    633                         //pixel position of each unit in up-sampled layer
    634                         UInt    uiPelX = pcCUDes->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
    635                         UInt    uiPelY = pcCUDes->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
    636                         UInt uiBaseCUAddr, uiBaseAbsPartIdx;
    637                 pcPicBase->deriveUnitIdxBase(uiPelX + 8, uiPelY + 8, upSampleRatio, uiBaseCUAddr, uiBaseAbsPartIdx);
    638                         if( (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_NONE) && (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_INTRA) )  //base layer unit not skip and invalid mode
    639                         {
    640                                 for(UInt list = 0; list < 2; list++)  //each list
    641                                 {
    642                                         TComMv cMv = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)list)->getMv(uiBaseAbsPartIdx);
    643                                         Int refIdx = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)list)->getRefIdx(uiBaseAbsPartIdx);
    644 
    645                                         Int Hor =  ((Int)upSampleRatio * cMv.getHor())/2 ;
    646                                         Int Ver =  ((Int)upSampleRatio * cMv.getVer())/2 ;
    647 
    648                                         TComMv cScaledMv(Hor, Ver);
    649                                         TComMvField sMvField;
    650                                         sMvField.setMvField(cScaledMv, refIdx);
    651 
    652                                         pcCUDes->getCUMvField((RefPicList)list)->setMvField(sMvField, uiAbsPartIdx);
    653                                         pcCUDes->setPredictionMode(uiAbsPartIdx, MODE_INTER);
    654                                 }
    655                         }
    656 
    657                         else
    658                         {
    659                                 TComMvField zeroMvField;  //zero MV and invalid reference index
    660                                 pcCUDes->getCUMvField(REF_PIC_LIST_0)->setMvField(zeroMvField, uiAbsPartIdx);
    661                                 pcCUDes->getCUMvField(REF_PIC_LIST_1)->setMvField(zeroMvField, uiAbsPartIdx);
    662                                 pcCUDes->setPredictionMode(uiAbsPartIdx, MODE_INTRA);
    663                         }
    664 
    665                         for(UInt i = 1; i < unitNum; i++ ) 
    666                         {
    667                                 pcCUDes->getCUMvField(REF_PIC_LIST_0)->setMvField(pcCUDes->getCUMvField(REF_PIC_LIST_0)->getMv(uiAbsPartIdx), pcCUDes->getCUMvField(REF_PIC_LIST_0)->getRefIdx(uiAbsPartIdx), uiAbsPartIdx + i);
    668                                 pcCUDes->getCUMvField(REF_PIC_LIST_1)->setMvField(pcCUDes->getCUMvField(REF_PIC_LIST_1)->getMv(uiAbsPartIdx), pcCUDes->getCUMvField(REF_PIC_LIST_1)->getRefIdx(uiAbsPartIdx), uiAbsPartIdx + i);
    669                                 pcCUDes->setPredictionMode(uiAbsPartIdx+i, pcCUDes->getPredictionMode(uiAbsPartIdx))  ;
    670                         }
    671                 }
    672                         memset( pcCUDes->getPartitionSize(), SIZE_2Nx2N, sizeof(char)*uiNumPartitions);
    673         }
     596  Int iBWidth   = pcPicBase->getPicYuvRec()->getWidth () - pcPicBase->getPicYuvRec()->getPicCropLeftOffset() - pcPicBase->getPicYuvRec()->getPicCropRightOffset();
     597  Int iBHeight  = pcPicBase->getPicYuvRec()->getHeight() - pcPicBase->getPicYuvRec()->getPicCropTopOffset() - pcPicBase->getPicYuvRec()->getPicCropBottomOffset();
     598
     599  Int iEWidth   = getPicYuvRec()->getWidth() -  getPicYuvRec()->getPicCropLeftOffset() - getPicYuvRec()->getPicCropRightOffset();
     600  Int iEHeight  = getPicYuvRec()->getHeight() - getPicYuvRec()->getPicCropTopOffset() -  getPicYuvRec()->getPicCropBottomOffset();
     601
     602
     603  UInt upSampleRatio = 0;
     604  if(iEWidth == iBWidth && iEHeight == iBHeight)
     605  {
     606    upSampleRatio = 2;
     607  }
     608  else if(2*iEWidth == 3*iBWidth && 2*iEHeight == 3*iBHeight)
     609  {
     610    upSampleRatio = 3;
     611  }
     612  else if(iEWidth == 2*iBWidth && iEHeight == 2*iBHeight)
     613  {
     614    upSampleRatio = 4;
     615  }
     616  else
     617  {
     618    assert(0);
     619  }
     620
     621  for(UInt cuIdx = 0; cuIdx < getPicSym()->getNumberOfCUsInFrame(); cuIdx++)  //each LCU
     622  {
     623    UInt uiNumPartitions   = 1<<(g_uiMaxCUDepth<<1);
     624
     625    TComDataCU*             pcCUDes = getCU(cuIdx);
     626
     627    UInt uiWidthMinPU      = g_uiMaxCUWidth/(1<<g_uiMaxCUDepth);
     628    UInt uiHeightMinPU     = g_uiMaxCUHeight/(1<<g_uiMaxCUDepth);
     629    Int unitNum = max (1, (Int)((16/uiWidthMinPU)*(16/uiHeightMinPU)) );
     630
     631    for(UInt uiAbsPartIdx = 0; uiAbsPartIdx < uiNumPartitions; uiAbsPartIdx+=unitNum )  //each 16x16 unit
     632    {
     633      //pixel position of each unit in up-sampled layer
     634      UInt  uiPelX = pcCUDes->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
     635      UInt  uiPelY = pcCUDes->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
     636      UInt uiBaseCUAddr, uiBaseAbsPartIdx;
     637         pcPicBase->deriveUnitIdxBase(uiPelX + 8, uiPelY + 8, upSampleRatio, uiBaseCUAddr, uiBaseAbsPartIdx);
     638      if( (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_NONE) && (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_INTRA) )  //base layer unit not skip and invalid mode
     639      {
     640        for(UInt list = 0; list < 2; list++)  //each list
     641        {
     642          TComMv cMv = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)list)->getMv(uiBaseAbsPartIdx);
     643          Int refIdx = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)list)->getRefIdx(uiBaseAbsPartIdx);
     644
     645          Int Hor =  ((Int)upSampleRatio * cMv.getHor())/2 ;
     646          Int Ver =  ((Int)upSampleRatio * cMv.getVer())/2 ;
     647
     648          TComMv cScaledMv(Hor, Ver);
     649          TComMvField sMvField;
     650          sMvField.setMvField(cScaledMv, refIdx);
     651
     652          pcCUDes->getCUMvField((RefPicList)list)->setMvField(sMvField, uiAbsPartIdx);
     653          pcCUDes->setPredictionMode(uiAbsPartIdx, MODE_INTER);
     654        }
     655      }
     656
     657      else
     658      {
     659        TComMvField zeroMvField;  //zero MV and invalid reference index
     660        pcCUDes->getCUMvField(REF_PIC_LIST_0)->setMvField(zeroMvField, uiAbsPartIdx);
     661        pcCUDes->getCUMvField(REF_PIC_LIST_1)->setMvField(zeroMvField, uiAbsPartIdx);
     662        pcCUDes->setPredictionMode(uiAbsPartIdx, MODE_INTRA);
     663      }
     664
     665      for(UInt i = 1; i < unitNum; i++ ) 
     666      {
     667        pcCUDes->getCUMvField(REF_PIC_LIST_0)->setMvField(pcCUDes->getCUMvField(REF_PIC_LIST_0)->getMv(uiAbsPartIdx), pcCUDes->getCUMvField(REF_PIC_LIST_0)->getRefIdx(uiAbsPartIdx), uiAbsPartIdx + i);
     668        pcCUDes->getCUMvField(REF_PIC_LIST_1)->setMvField(pcCUDes->getCUMvField(REF_PIC_LIST_1)->getMv(uiAbsPartIdx), pcCUDes->getCUMvField(REF_PIC_LIST_1)->getRefIdx(uiAbsPartIdx), uiAbsPartIdx + i);
     669        pcCUDes->setPredictionMode(uiAbsPartIdx+i, pcCUDes->getPredictionMode(uiAbsPartIdx))  ;
     670      }
     671    }
     672      memset( pcCUDes->getPartitionSize(), SIZE_2Nx2N, sizeof(char)*uiNumPartitions);
     673  }
    674674}
    675675#endif

  • branches/SHM-1.0-dev/source/Lib/TLibCommon/TComSlice.cpp

    r27 r32  
    580580  for(Int refIdx = 0; refIdx < pcRefPicBL->getSlice(0)->getNumRefIdx(REF_PIC_LIST_0); refIdx++)
    581581  {
    582           ilpPic[0]->getSlice(0)->setRefPOC(pcRefPicBL->getSlice(0)->getRefPOC(REF_PIC_LIST_0, refIdx), REF_PIC_LIST_0, refIdx);
     582    ilpPic[0]->getSlice(0)->setRefPOC(pcRefPicBL->getSlice(0)->getRefPOC(REF_PIC_LIST_0, refIdx), REF_PIC_LIST_0, refIdx);
    583583  }
    584584  for(Int refIdx = 0; refIdx < pcRefPicBL->getSlice(0)->getNumRefIdx(REF_PIC_LIST_1); refIdx++)
    585585  {
    586           ilpPic[0]->getSlice(0)->setRefPOC(pcRefPicBL->getSlice(0)->getRefPOC(REF_PIC_LIST_1, refIdx), REF_PIC_LIST_1, refIdx);
     586    ilpPic[0]->getSlice(0)->setRefPOC(pcRefPicBL->getSlice(0)->getRefPOC(REF_PIC_LIST_1, refIdx), REF_PIC_LIST_1, refIdx);
    587587  }
    588588  for(Int refIdx = 0; refIdx < pcRefPicBL->getSlice(0)->getNumRefIdx(REF_PIC_LIST_0); refIdx++)
    589589  {
    590           ilpPic[0]->getSlice(0)->setRefPic(pcRefPicBL->getSlice(0)->getRefPic(REF_PIC_LIST_0, refIdx), REF_PIC_LIST_0, refIdx);
     590    ilpPic[0]->getSlice(0)->setRefPic(pcRefPicBL->getSlice(0)->getRefPic(REF_PIC_LIST_0, refIdx), REF_PIC_LIST_0, refIdx);
    591591  }
    592592  for(Int refIdx = 0; refIdx < pcRefPicBL->getSlice(0)->getNumRefIdx(REF_PIC_LIST_1); refIdx++)
    593593  {
    594           ilpPic[0]->getSlice(0)->setRefPic(pcRefPicBL->getSlice(0)->getRefPic(REF_PIC_LIST_1, refIdx), REF_PIC_LIST_1, refIdx);
     594    ilpPic[0]->getSlice(0)->setRefPic(pcRefPicBL->getSlice(0)->getRefPic(REF_PIC_LIST_1, refIdx), REF_PIC_LIST_1, refIdx);
    595595  }
    596596  return;

  • branches/SHM-1.0-dev/source/Lib/TLibCommon/TComYuv.h

    r17 r32  
    116116  Void    copyFromPicChroma    ( TComPicYuv* pcPicYuvSrc, UInt iCuAddr, UInt uiAbsZorderIdx );
    117117#if NO_RESIDUAL_FLAG_FOR_BLPRED
    118   Void          copyFromPicLuma  ( TComPicYuv* pcPicYuvSrc, UInt iCuAddr, UInt uiZorderIdxInCU, UInt uiAbsZorderIdx, UInt uiWidth, UInt uiHeight );
     118  Void    copyFromPicLuma  ( TComPicYuv* pcPicYuvSrc, UInt iCuAddr, UInt uiZorderIdxInCU, UInt uiAbsZorderIdx, UInt uiWidth, UInt uiHeight );
    119119  Void    copyFromPicChroma( TComPicYuv* pcPicYuvSrc, UInt iCuAddr, UInt uiZorderIdxInCU, UInt uiAbsZorderIdx, UInt uiCWidth, UInt uiCHeight, UInt uiChromaId  );
    120120#endif

  • branches/SHM-1.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r25 r32  
    847847  if(pcSPS->getLayerId() > 0)
    848848  {
    849           READ_FLAG( uiCode, "sps_enh_mfm_enable_flag" );
    850           pcSPS->setMFMEnabledFlag( uiCode ? true : false );
    851           assert(pcSPS->getMFMEnabledFlag());
     849    READ_FLAG( uiCode, "sps_enh_mfm_enable_flag" );
     850    pcSPS->setMFMEnabledFlag( uiCode ? true : false );
     851    assert(pcSPS->getMFMEnabledFlag());
    852852  }
    853853#endif

  • branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r25 r32  
    603603  if( pcSPS->getLayerId() > 0 )
    604604  {
    605           assert(pcSPS->getMFMEnabledFlag());
    606           WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
     605    assert(pcSPS->getMFMEnabledFlag());
     606    WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
    607607  }
    608608#endif

  • branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncCu.cpp

    r23 r32  
    13521352    {
    13531353#if REF_IDX_ME_ZEROMV
    1354                 Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
    1355                 if(bZeroMVILR)
    1356                 {
     1354    Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
     1355    if(bZeroMVILR)
     1356    {
    13571357#endif
    13581358        if(!(uiNoResidual==1 && mergeCandBuffer[uiMergeCand]==1))
    … …  
    14081408    }
    14091409#if REF_IDX_ME_ZEROMV
    1410         }
     1410  }
    14111411#endif
    14121412   }

  • branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncSearch.cpp

    r24 r32  
    31873187    uhInterDirNeighbours[uiMergeCand] = 0;
    31883188    cMvFieldNeighbours[0 + 2*uiMergeCand].setMvField(TComMv(), NOT_VALID);
    3189           cMvFieldNeighbours[1 + 2*uiMergeCand].setMvField(TComMv(), NOT_VALID);
     3189    cMvFieldNeighbours[1 + 2*uiMergeCand].setMvField(TComMv(), NOT_VALID);
    31903190  }
    31913191#endif
    … …  
    32123212  {
    32133213#if REF_IDX_ME_ZEROMV
    3214           Bool bZeroMVILR = pcCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
    3215           if(bZeroMVILR)
    3216           {
     3214    Bool bZeroMVILR = pcCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
     3215    if(bZeroMVILR)
     3216    {
    32173217#endif
    32183218      UInt uiCostCand = MAX_UINT;
    … …  
    32403240      }
    32413241#if REF_IDX_ME_ZEROMV
    3242           }
     3242    }
    32433243#endif
    32443244    }
    … …  
    34293429        {
    34303430#if REF_IDX_ME_ZEROMV
    3431                   Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
    3432                   if(bZeroMVILR)
    3433                   {
     3431      Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
     3432      if(bZeroMVILR)
     3433      {
    34343434#endif
    34353435          bestBiPDist = biPDistTemp;
    … …  
    34373437          bestBiPRefIdxL1 = iRefIdxTemp;
    34383438#if REF_IDX_ME_ZEROMV
    3439                   }
     3439      }
    34403440#endif
    34413441        }
    … …  
    35773577    //  Bi-directional prediction
    35783578#if REF_IDX_ME_ZEROMV
    3579         if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) && !(pcCU->getSlice()->getMvdL1ZeroFlag() && bestBiPDist == MAX_INT) )
     3579  if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) && !(pcCU->getSlice()->getMvdL1ZeroFlag() && bestBiPDist == MAX_INT) )
    35803580#else
    35813581    if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) )
Note: See TracChangeset for help on using the changeset viewer.