Changeset 765 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibDecoder


Ignore:
Timestamp:
12 Jan 2014, 02:46:46 (11 years ago)
Author:
tech
Message:

Cleanup part 2

Location:
branches/HTM-9.2-dev0/source/Lib/TLibDecoder
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r764 r765  
    18591859    pcVPS->setARPStepNum( i, 1 );
    18601860#endif 
    1861 #if MTK_SPIVMP_F0110
     1861#if H_3D_SPIVMP
    18621862    pcVPS->setSubPULog2Size(i, 0);
    18631863#endif
    … …  
    18681868#if H_3D_IV_MERGE
    18691869        READ_FLAG( uiCode, "iv_mv_pred_flag[i]");          pcVPS->setIvMvPredFlag         ( i, uiCode == 1 ? true : false );
    1870 #if MTK_SPIVMP_F0110
     1870#if H_3D_SPIVMP
    18711871        READ_UVLC (uiCode, "log2_sub_PU_size_minus2");     pcVPS->setSubPULog2Size(i, uiCode+2);
    18721872#endif
    … …  
    18851885      else
    18861886      {
    1887 #if QC_DEPTH_IV_MRG_F0125 && H_3D_IV_MERGE
     1887#if H_3D_IV_MERGE
    18881888        if(i!=1)
    18891889        {
    … …  
    18911891        }
    18921892#endif
    1893 #if MTK_SPIVMP_F0110
     1893#if H_3D_SPIVMP
    18941894        if (i!=1)
    18951895        {
    … …  
    18971897        }
    18981898#endif
    1899 #if SEC_MPI_ENABLING_MERGE_F0150
     1899#if H_3D_IV_MERGE
    19001900        READ_FLAG( uiCode, "mpi_flag[i]" );             pcVPS->setMPIFlag( i, uiCode == 1 ? true : false );
    19011901#endif
    … …  
    25682568      READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
    25692569#if H_3D_IV_MERGE
    2570 #if SEC_MPI_ENABLING_MERGE_F0150
    25712570      if(rpcSlice->getIsDepth())
    25722571      {
    … …  
    25802579        rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    25812580      }
    2582 #else
    2583       Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
    2584       rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    2585 #endif
     2581
    25862582#else
    25872583      rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);

  • branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r764 r765  
    135135Void TDecCu::decompressCU( TComDataCU* pcCU )
    136136{
    137 #if !QC_DEPTH_IV_MRG_F0125
     137#if !H_3D_IV_MERGE
    138138  xDecompressCU( pcCU, 0,  0 );
    139139#endif
    … …  
    315315      m_ppcCU[uiDepth]->setHeight ( 0, pcCU->getSlice()->getSPS()->getMaxCUHeight()/(1<<uiDepth)  );
    316316      m_ppcCU[uiDepth]->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );     
    317 #if QC_DEPTH_IV_MRG_F0125
     317#if H_3D_IV_MERGE
    318318      if( pcCU->getSlice()->getIsDepth())
    319319      {
    … …  
    333333        DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo);
    334334      }
    335 #if QC_DEPTH_IV_MRG_F0125
     335#if H_3D_IV_MERGE
    336336      }
    337337#endif
    … …  
    401401    memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    402402    InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    403 #if MTK_SPIVMP_F0110
     403#if H_3D_SPIVMP
    404404    Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
    405405    memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
    … …  
    412412    m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    413413    m_ppcCU[uiDepth]->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
    414 #if MTK_SPIVMP_F0110
     414#if H_3D_SPIVMP
    415415      , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
    416416#endif
    … …  
    462462      }
    463463    }
    464 #if MTK_SPIVMP_F0110
     464#if H_3D_SPIVMP
    465465    pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
    466466    if (bSPIVMPFlag[uiMergeIndex])
    … …  
    482482      }
    483483    }
    484 #if MTK_F0110_FIX
    485484    delete[] pcMvFieldSP;
    486485    delete[] puhInterDirSP;
    487 #else
    488     delete pcMvFieldSP;
    489     delete puhInterDirSP;
    490 #endif
    491486#endif
    492487
    493488    xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
    494 #if QC_DEPTH_IV_MRG_F0125
     489#if H_3D_IV_MERGE
    495490    xDecompressCU(pcCU, uiAbsPartIdx, uiDepth );
    496491#endif
    … …  
    508503    {
    509504      xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
    510 #if QC_DEPTH_IV_MRG_F0125
     505#if H_3D_IV_MERGE
    511506      xDecompressCU(pcCU, uiAbsPartIdx, uiDepth );
    512507#endif
    … …  
    528523  setdQPFlag( bCodeDQP );
    529524  xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
    530 #if QC_DEPTH_IV_MRG_F0125
     525#if H_3D_IV_MERGE
    531526  xDecompressCU(pcCU, uiAbsPartIdx, uiDepth );
    532527#endif
    … …  
    546541{
    547542  TComPic* pcPic = pcCU->getPic();
    548 #if !QC_DEPTH_IV_MRG_F0125 
     543#if !H_3D_IV_MERGE
    549544  Bool bBoundary = false;
    550545  UInt uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];

  • branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r764 r765  
    209209  UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS];
    210210#endif
    211 #if MTK_SPIVMP_F0110
     211#if H_3D_SPIVMP
    212212  Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
    213213  TComMvField*  pcMvFieldSP;
    … …  
    256256          memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    257257          InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    258 #if MTK_SPIVMP_F0110
     258#if H_3D_SPIVMP
    259259          memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
    260260#endif
    … …  
    262262          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
    263263          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
    264 #if MTK_SPIVMP_F0110
     264#if H_3D_SPIVMP
    265265            , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
    266266#endif
    … …  
    293293        memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    294294        InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    295 #if MTK_SPIVMP_F0110
     295#if H_3D_SPIVMP
    296296        memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
    297297#endif
    … …  
    299299        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    300300        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
    301 #if MTK_SPIVMP_F0110
     301#if H_3D_SPIVMP
    302302          , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
    303303#endif
    … …  
    331331        }
    332332      }
    333 #if MTK_SPIVMP_F0110
     333#if H_3D_SPIVMP
    334334      pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth ); 
    335335      if (bSPIVMPFlag[uiMergeIndex] != 0)
    … …  
    385385    }
    386386  }
    387 #if MTK_SPIVMP_F0110
    388 #if MTK_F0110_FIX
     387#if H_3D_SPIVMP
    389388  delete[] pcMvFieldSP;
    390389  delete[] puhInterDirSP;
    391 #else
    392   delete pcMvFieldSP;
    393   delete puhInterDirSP;
    394 #endif
    395390#endif
    396391  return;

  • branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.cpp

    r758 r765  
    302302}
    303303
    304 #if QC_DEPTH_IV_MRG_F0125
     304#if H_3D_IV_MERGE
    305305Void
    306306CamParsCollector::copyCamParamForSlice( TComSlice* pcSlice )
    … …  
    10071007    pcSlice->setRefPicList     ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true );
    10081008#if H_3D_ARP
    1009 #if SHARP_ARP_REF_CHECK_F0105
    10101009    pcSlice->setARPStepNum(m_ivPicLists);
    1011 #else
    1012     pcSlice->setARPStepNum();
    1013 #endif
    10141010    if( pcSlice->getARPStepNum() > 1 )
    10151011    {
    … …  
    11131109  }
    11141110
    1115 #if QC_DEPTH_IV_MRG_F0125
     1111#if H_3D_IV_MERGE
    11161112  if( pcSlice->getIsDepth() && m_pcCamParsCollector )
    11171113  {
    … …  
    11271123    m_pcCamParsCollector->setSlice( pcSlice );
    11281124  }
    1129 #if QC_DEPTH_IV_MRG_F0125
     1125#if H_3D_IV_MERGE
    11301126  if( pcSlice->getIsDepth() )
    11311127  {

  • branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.h

    r738 r765  
    7878  Int**** getBaseViewShiftLUTI()  { return m_aiBaseViewShiftLUT;   }
    7979
    80 #if QC_DEPTH_IV_MRG_F0125
     80#if H_3D_IV_MERGE
    8181  Void  copyCamParamForSlice( TComSlice* pcSlice );
    8282#endif
Note: See TracChangeset for help on using the changeset viewer.