Ignore:
Timestamp:
19 Oct 2013, 02:18:06 (12 years ago)
Author:
tech
Message:

Macro removal part 1.

Location:
branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCavlc.cpp

    r622 r646  
    968968        }       
    969969#endif
    970 #if LGE_INTER_SDC_E0156
     970#if H_3D_INTER_SDC
    971971        WRITE_FLAG( pcVPS->getInterSDCFlag( i ) ? 1 : 0, "depth_inter_SDC_flag" );
    972972#endif
    … …  
    13091309        }       
    13101310#endif
    1311 #if LGE_INTER_SDC_E0156
     1311#if H_3D_INTER_SDC
    13121312        WRITE_FLAG( pcVPS->getInterSDCFlag( i ) ? 1 : 0, "depth_inter_SDC_flag" );
    13131313#endif
    … …  
    22822282}
    22832283
    2284 #if LGE_INTER_SDC_E0156
     2284#if H_3D_INTER_SDC
    22852285Void TEncCavlc::codeInterSDCFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx )
    22862286{

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCavlc.h

    r622 r646  
    133133  Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    134134#endif
    135 #if LGE_INTER_SDC_E0156
     135#if H_3D_INTER_SDC
    136136  Void codeInterSDCFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    137137  Void codeInterSDCResidualData  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiSegment );

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCfg.h

    r638 r646  
    417417  Bool      m_bUseIC;
    418418#endif
    419 #if LGE_INTER_SDC_E0156
     419#if H_3D_INTER_SDC
    420420  bool      m_bInterSDC;
    421421#endif
    … …  
    528528  Bool       getUseIC                       ()               { return m_bUseIC; }
    529529#endif
    530 #if LGE_INTER_SDC_E0156
     530#if H_3D_INTER_SDC
    531531  Void       setInterSDCEnable              ( Bool bVal )    { m_bInterSDC = bVal; }
    532532  Bool       getInterSDCEnable              ()               { return m_bInterSDC; }

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp

    r643 r646  
    16531653  m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
    16541654#endif
    1655 #if LGE_INTER_SDC_E0156
     1655#if H_3D_INTER_SDC
    16561656  m_pcEntropyCoder->encodeInterSDCFlag( pcCU, uiAbsPartIdx, false );
    16571657#endif
    … …  
    19481948
    19491949          rpcTempCU->setSkipFlagSubParts( rpcTempCU->getQtRootCbf(0) == 0, 0, uhDepth );
    1950 #if LGE_INTER_SDC_E0156
     1950#if H_3D_INTER_SDC
    19511951          TComDataCU *rpcTempCUPre = rpcTempCU;
    19521952#endif
    … …  
    19541954          xCheckDQP( rpcTempCU );
    19551955          xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
    1956 #if LGE_INTER_SDC_E0156
     1956#if H_3D_INTER_SDC
    19571957          if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) && rpcTempCU->getSlice()->getIsDepth() && !uiNoResidual )
    19581958          {
    … …  
    19901990      if( m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip )
    19911991      {
    1992 #if LGE_INTER_SDC_E0156
     1992#if H_3D_INTER_SDC
    19931993        if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) )
    19941994        {
    … …  
    19991999#endif
    20002000        bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
    2001 #if LGE_INTER_SDC_E0156
     2001#if H_3D_INTER_SDC
    20022002        }
    20032003#endif
    … …  
    22032203#endif
    22042204  rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
    2205 #if LGE_INTER_SDC_E0156
     2205#if H_3D_INTER_SDC
    22062206  TComDataCU *rpcTempCUPre = rpcTempCU;
    22072207#endif
    22082208  xCheckDQP( rpcTempCU );
    22092209  xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
    2210 #if LGE_INTER_SDC_E0156
     2210#if H_3D_INTER_SDC
    22112211  if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) && rpcTempCU->getSlice()->getIsDepth() )
    22122212  {

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncEntropy.cpp

    r608 r646  
    662662#endif
    663663
    664 #if LGE_INTER_SDC_E0156
     664#if H_3D_INTER_SDC
    665665  if( pcCU->getInterSDCFlag( uiAbsPartIdx ) )
    666666  {
    … …  
    824824}
    825825
    826 #if LGE_INTER_SDC_E0156
     826#if H_3D_INTER_SDC
    827827Void TEncEntropy::encodeInterSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    828828{

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncEntropy.h

    r608 r646  
    9494  virtual Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    9595#endif
    96 #if LGE_INTER_SDC_E0156
     96#if H_3D_INTER_SDC
    9797  virtual Void codeInterSDCFlag  ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    9898  virtual Void codeInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiSegment ) = 0;
    … …  
    185185  Void encodeICFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    186186#endif
    187 #if LGE_INTER_SDC_E0156
     187#if H_3D_INTER_SDC
    188188  Void encodeInterSDCFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    189189  Void encodeInterSDCResidualData( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD );

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncGOP.cpp

    r637 r646  
    18941894        pcPic->destroyNonDBFilterInfo();
    18951895      }
    1896 #if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
     1896#if H_3D
    18971897      pcPic->compressMotion(2);
    18981898#endif

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSbac.cpp

    r622 r646  
    9595#if H_3D_DIM_DMM
    9696, m_cDmm1DataSCModel          ( 1,             1,               NUM_DMM1_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    97 #if !SEC_DMM2_E0146_HHIFIX
    98 , m_cDmm2DataSCModel          ( 1,             1,               NUM_DMM2_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    99 #endif
    10097, m_cDmm3DataSCModel          ( 1,             1,               NUM_DMM3_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    10198#endif
    … …  
    108105#endif
    109106#endif
    110 #if LGE_INTER_SDC_E0156
     107#if H_3D_INTER_SDC
    111108, m_cInterSDCFlagSCModel             ( 1,             1,  NUM_INTER_SDC_FLAG_CTX           , m_contextModels + m_numContextModels, m_numContextModels)
    112109, m_cInterSDCResidualSCModel         ( 1,             1,  NUM_INTER_SDC_RESIDUAL_CTX       , m_contextModels + m_numContextModels, m_numContextModels)
    … …  
    177174#if H_3D_DIM_DMM
    178175  m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
    179 #if !SEC_DMM2_E0146_HHIFIX
    180   m_cDmm2DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA );
    181 #endif
    182176  m_cDmm3DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM3_DATA );
    183177#endif
    … …  
    190184#endif
    191185#endif
    192 #if LGE_INTER_SDC_E0156
     186#if H_3D_INTER_SDC
    193187  m_cInterSDCFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_FLAG );
    194188  m_cInterSDCResidualSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_RESIDUAL );
    … …  
    232226      curCost += m_cCUICFlagSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_IC_FLAG );
    233227#endif
    234 #if LGE_INTER_SDC_E0156
     228#if H_3D_INTER_SDC
    235229      curCost += m_cInterSDCFlagSCModel.calcCost      ( curSliceType, qp, (UChar*)INIT_INTER_SDC_FLAG );
    236230      curCost += m_cInterSDCResidualSCModel.calcCost  ( curSliceType, qp, (UChar*)INIT_INTER_SDC_RESIDUAL );
    … …  
    268262#if H_3D_DIM_DMM
    269263      curCost += m_cDmm1DataSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_DMM1_DATA );
    270 #if !SEC_DMM2_E0146_HHIFIX
    271       curCost += m_cDmm2DataSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_DMM2_DATA );
    272 #endif
    273264      curCost += m_cDmm3DataSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_DMM3_DATA );
    274265#endif
    … …  
    340331#if H_3D_DIM_DMM
    341332  m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
    342 #if !SEC_DMM2_E0146_HHIFIX
    343   m_cDmm2DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA );
    344 #endif
    345333  m_cDmm3DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM3_DATA );
    346334#endif
    … …  
    353341#endif
    354342#endif
    355 #if LGE_INTER_SDC_E0156
     343#if H_3D_INTER_SDC
    356344  m_cInterSDCFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_FLAG );
    357345  m_cInterSDCResidualSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_RESIDUAL );
    … …  
    548536  }
    549537}
    550 
    551 #if !SEC_DMM2_E0146_HHIFIX
    552 Void TEncSbac::xCodeDmm2Offset( Int iOffset )
    553 {
    554   if( DMM2_DELTAEND_MAX > 0 )
    555   {
    556     m_pcBinIf->encodeBin( (iOffset != 0) , m_cDmm2DataSCModel.get(0, 0, 0) );
    557     if( iOffset != 0 )
    558     {
    559       UInt uiAbsValMinus1 = abs(iOffset)-1;
    560       m_pcBinIf->encodeBin( (uiAbsValMinus1 & 0x01),      m_cDmm2DataSCModel.get(0, 0, 0) );
    561       m_pcBinIf->encodeBin( (uiAbsValMinus1 & 0x02) >> 1, m_cDmm2DataSCModel.get(0, 0, 0) );
    562 
    563       UInt uiSign = (iOffset > 0) ? 0 : 1;
    564       m_pcBinIf->encodeBinEP( uiSign );
    565     }
    566   }
    567 }
    568 #endif
    569538
    570539Void TEncSbac::xCodeDmm3WedgeIdx( UInt uiIntraIdx, Int iNumBit )
    … …  
    12401209      xCodeDmm1WedgeIdx( pcCU->getDmmWedgeTabIdx( dimType, absPartIdx ), g_dmm1TabIdxBits[pcCU->getIntraSizeIdx(absPartIdx)] );
    12411210    } break;
    1242 #if !SEC_DMM2_E0146_HHIFIX
    1243   case( DMM2_IDX ):
    1244     {
    1245       xCodeDmm2Offset( pcCU->getDmm2DeltaEnd( absPartIdx ) );
    1246     } break;
    1247 #endif
    12481211  case( DMM3_IDX ):
    12491212    {
    … …  
    12941257Void TEncSbac::codeIntraDepthMode( TComDataCU* pcCU, UInt absPartIdx )
    12951258{
    1296 #if ZJU_DEPTH_INTRA_MODE_E0204
    12971259    UInt codeWordTable[3][7] =    {{0, 0, 0, 2, 0,6, 7},{0, 0, 2, 7, 3, 6, 2},{0, 1, 0, 0, 0, 0, 0}};
    12981260    UInt codeWordLenTable[3][7] = {{0, 1, 0, 2, 0,3, 3},{1, 1, 2, 3, 2, 3, 2},{1, 1, 0, 0, 0, 0, 0}};
    1299 #else
    1300 #if LGE_SDC_REMOVE_DC_E0158
    1301 #if SEC_DMM2_E0146_HHIFIX
    1302   UInt codeWordTable[3][7] =    {{0, 0, 0, 2, 0,6, 7},{0, 2, 3, 4, 5, 6, 7},{0, 1, 0, 0, 0, 0, 0}};
    1303   UInt codeWordLenTable[3][7] = {{0, 1, 0, 2, 0,3, 3},{2, 3, 3, 3, 3, 3, 3},{1, 1, 0, 0, 0, 0, 0}};
    1304 #else
    1305   UInt codeWordTable[3][8] =    { { 0, 0, 0, 2, 0, 6, 0, 7 }, { 0, 2, 3, 4, 5, 6, 15, 14 }, { 0, 1, 0, 0, 0, 0, 0, 0 } };
    1306   UInt codeWordLenTable[3][8] = { { 0, 1, 0, 2, 0, 3, 0, 3 }, { 2, 3, 3, 3, 3, 3,  4,  4 }, { 1, 1, 0, 0, 0, 0, 0, 0 } };
    1307 #endif
    1308 #else
    1309 #if SEC_DMM2_E0146_HHIFIX
    1310   UInt codeWordTable[3][8] =    {{0, 0, 0, 2, 0,6, 0, 7},{0, 2, 3, 4, 5, 6, 14, 15},{0, 2, 0, 0, 0, 0, 3, 0}};
    1311   UInt codeWordLenTable[3][8] = {{0, 1, 0, 2, 0,3, 0, 3},{2, 3, 3, 3, 3, 3,  4,  4},{1, 2, 0, 0, 0, 0, 2, 0}};
    1312 #else
    1313   UInt codeWordTable[3][9] =    {{0, 0, 0, 2, 0,6, 0, 0, 7},{0, 2, 3, 4, 5, 6, 14, 31, 30},{0, 2, 0, 0, 0, 0, 3, 0, 0}};
    1314   UInt codeWordLenTable[3][9] = {{0, 1, 0, 2, 0,3, 0, 0, 3},{2, 3, 3, 3, 3, 3,  4,  5,  5},{1, 2, 0, 0, 0, 0, 2, 0, 0}};
    1315 #endif
    1316 #endif
    1317 #endif
    13181261  UInt dir = pcCU->getLumaIntraDir( absPartIdx );
    13191262  UInt puIdx = (pcCU->getWidth(absPartIdx) == 64) ? 2 : ( (pcCU->getPartitionSize(absPartIdx) == SIZE_NxN && pcCU->getWidth(absPartIdx) == 8) ? 0 : 1 );
    … …  
    13321275    case DMM3_IDX: codeIdx = 5; break;
    13331276#if LGE_SDC_REMOVE_DC_E0158
    1334 #if SEC_DMM2_E0146_HHIFIX
    13351277    case  RBC_IDX: codeIdx = 6; break;
    13361278#else
    1337     case DMM2_IDX: codeIdx = 6; break;
    13381279    case  RBC_IDX: codeIdx = 7; break;
    1339 #endif
    1340 #else
    1341 #if SEC_DMM2_E0146_HHIFIX
    1342     case  RBC_IDX: codeIdx = 7; break;
    1343 #else
    1344     case DMM2_IDX: codeIdx = 7; break;
    1345     case  RBC_IDX: codeIdx = 8; break;
    1346 #endif
    13471280#endif
    13481281    default:                    break;
    … …  
    13631296  }
    13641297#endif
    1365 #if ZJU_DEPTH_INTRA_MODE_E0204
    13661298  if( puIdx==1 )
    13671299  {
    … …  
    13751307      }
    13761308  }
    1377 #endif
    13781309  //mode coding
    13791310  for( UInt i = 0; i < codeWordLenTable[puIdx][codeIdx]; i++ )
    … …  
    23042235}
    23052236
    2306 #if LGE_INTER_SDC_E0156
     2237#if H_3D_INTER_SDC
    23072238Void TEncSbac::codeInterSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
    23082239{

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSbac.h

    r622 r646  
    121121#if H_3D_DIM_DMM
    122122  Void  xCodeDmm1WedgeIdx    ( UInt uiTabIdx, Int iNumBit );
    123 #if !SEC_DMM2_E0146_HHIFIX
    124   Void  xCodeDmm2Offset      ( Int iOffset );
    125 #endif
    126123  Void  xCodeDmm3WedgeIdx    ( UInt uiIntraIdx, Int iNumBit );
    127124#endif
    … …  
    160157  Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    161158#endif
    162 #if LGE_INTER_SDC_E0156
     159#if H_3D_INTER_SDC
    163160  Void codeInterSDCFlag  ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    164161  Void codeInterSDCResidualData  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiSegment );
    … …  
    256253#if H_3D_DIM_DMM
    257254  ContextModel3DBuffer m_cDmm1DataSCModel;
    258 #if !SEC_DMM2_E0146_HHIFIX
    259   ContextModel3DBuffer m_cDmm2DataSCModel;
    260 #endif
    261255  ContextModel3DBuffer m_cDmm3DataSCModel;
    262256#endif
    … …  
    269263#endif
    270264#endif
    271 #if LGE_INTER_SDC_E0156
     265#if H_3D_INTER_SDC
    272266  ContextModel3DBuffer m_cInterSDCFlagSCModel;
    273267  ContextModel3DBuffer m_cInterSDCResidualSCModel;

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.cpp

    r630 r646  
    4141#include "TEncSearch.h"
    4242#include <math.h>
    43 #if LGE_INTER_SDC_E0156
     43#if H_3D_INTER_SDC
    4444#include <memory.h>
    4545#endif
    … …  
    323323  m_cDistParam.bUseIC = pcPatternKey->getICFlag();
    324324#endif
    325 #if LGE_INTER_SDC_E0156
     325#if H_3D_INTER_SDC
    326326  m_cDistParam.bUseSDCMRSAD = pcPatternKey->getSDCMRSADFlag();
    327327#endif
    … …  
    755755    m_cDistParam.bUseIC = pcPatternKey->getICFlag();
    756756#endif
    757 #if LGE_INTER_SDC_E0156
     757#if H_3D_INTER_SDC
    758758    m_cDistParam.bUseSDCMRSAD = pcPatternKey->getSDCMRSADFlag();
    759759#endif
    … …  
    19001900  // get DC prediction for each segment
    19011901  Pel apDCPredValues[2];
    1902 #if KWU_SDC_SIMPLE_DC_E0117
    19031902  analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode );
    1904 #else
    1905   analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride );
    1906 #endif
    19071903 
    19081904  // get original DC for each segment
    19091905  Pel apDCOrigValues[2];
    1910 #if KWU_SDC_SIMPLE_DC_E0117
    19111906  analyzeSegmentsSDC(piOrg, uiStride, uiWidth, apDCOrigValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode, true );
    1912 #else
    1913   analyzeSegmentsSDC(piOrg, uiStride, uiWidth, apDCOrigValues, uiNumSegments, pbMask, uiMaskStride );
    1914 #endif
    19151907 
    19161908  for( UInt uiSegment = 0; uiSegment < uiNumSegments; uiSegment++ )
    … …  
    28842876              biSegmentation = &(g_dmmWedgeLists[(g_aucConvertToBit[uiWidth])][uiTabIdx]);
    28852877            } break;
    2886 #if !SEC_DMM2_E0146_HHIFIX
    2887           case( DMM2_IDX ):
    2888             {
    2889               if( uiWidth > 4 )
    2890               {
    2891                 Int dmm2DeltaEnd = 0;
    2892                 xSearchDmm2Wedge( pcCU, uiPartOffset, piOrg, uiStride, uiWidth, uiHeight, uiTabIdx, dmm2DeltaEnd );
    2893                 pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dmmType, uiPartOffset, uiDepth + uiInitTrDepth );
    2894                 pcCU->setDmm2DeltaEndSubParts( dmm2DeltaEnd, uiPartOffset, uiDepth + uiInitTrDepth );
    2895                 biSegmentation = &(g_dmmWedgeLists[(g_aucConvertToBit[uiWidth])][uiTabIdx]);
    2896               }
    2897             } break;
    2898 #endif
    28992878          case( DMM3_IDX ):
    29002879            {
    … …  
    35883567  cDistParam.bUseIC = false;
    35893568#endif
    3590 #if LGE_INTER_SDC_E0156
     3569#if H_3D_INTER_SDC
    35913570  cDistParam.bUseSDCMRSAD = false;
    35923571#endif
    … …  
    47134692  pcPatternKey->setICFlag( bICFlag );
    47144693#endif
    4715 #if LGE_INTER_SDC_E0156
     4694#if H_3D_INTER_SDC
    47164695  if ( pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
    47174696  {
    … …  
    48694848      m_cDistParam.bUseIC = pcPatternKey->getICFlag();
    48704849#endif
    4871 #if LGE_INTER_SDC_E0156
     4850#if H_3D_INTER_SDC
    48724851      m_cDistParam.bUseSDCMRSAD = pcPatternKey->getSDCMRSADFlag();
    48734852#endif
    … …  
    54785457}
    54795458
    5480 #if LGE_INTER_SDC_E0156
     5459#if H_3D_INTER_SDC
    54815460Void TEncSearch::encodeResAndCalcRdInterSDCCU( TComDataCU* pcCU, TComYuv* pcOrg, TComYuv* pcPred, TComYuv* pcResi, TComYuv* pcRec, const UInt uiDepth )
    54825461{
    … …  
    68016780    m_pcEntropyCoder->encodeARPW( pcCU , 0 );
    68026781#endif
    6803 #if LGE_INTER_SDC_E0156
     6782#if H_3D_INTER_SDC
    68046783    m_pcEntropyCoder->encodeInterSDCFlag( pcCU, 0, true );
    68056784#endif
    … …  
    73277306  return;
    73287307}
    7329 
    7330 #if !SEC_DMM2_E0146_HHIFIX
    7331 Void TEncSearch::xSearchDmm2Wedge( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, Int& riWedgeDeltaEnd )
    7332 {
    7333   ruiTabIdx       = 0;
    7334   riWedgeDeltaEnd = 0;
    7335 
    7336   // local pred buffer
    7337   TComYuv cPredYuv;
    7338   cPredYuv.create( uiWidth, uiHeight );
    7339   cPredYuv.clear();
    7340 
    7341   UInt uiPredStride = cPredYuv.getStride();
    7342   Pel* piPred       = cPredYuv.getLumaAddr();
    7343 
    7344 
    7345   // regular wedge search
    7346   Dist uiBestDist    = RDO_DIST_MAX;
    7347   UInt uiBestTabIdx  = 0;
    7348   Int  iBestDeltaEnd = 0;
    7349 
    7350   UInt uiIdx = 0;
    7351   Pel refDC1 = 0; Pel refDC2 = 0;
    7352   for( Int iTestDeltaEnd = -DMM2_DELTAEND_MAX; iTestDeltaEnd <= DMM2_DELTAEND_MAX; iTestDeltaEnd++ )
    7353   {
    7354     uiIdx = xPredWedgeFromIntra( pcCU, uiAbsPtIdx, uiWidth, uiHeight, iTestDeltaEnd );
    7355     TComWedgelet* pcWedgelet = &(g_dmmWedgeLists[(g_aucConvertToBit[uiWidth])][uiIdx]);
    7356     xCalcBiSegDCs  ( piRef,  uiRefStride,  pcWedgelet->getPattern(), pcWedgelet->getStride(), refDC1, refDC2 );
    7357     xAssignBiSegDCs( piPred, uiPredStride, pcWedgelet->getPattern(), pcWedgelet->getStride(), refDC1, refDC2 );
    7358 
    7359     Dist uiActDist = RDO_DIST_MAX;
    7360 #if H_3D_VSO
    7361     if( m_pcRdCost->getUseVSO() )
    7362     {
    7363       if( m_pcRdCost->getUseEstimatedVSD() )
    7364       {
    7365         uiActDist = m_pcRdCost->getDistPartVSD( pcCU, uiAbsPtIdx, piPred, uiPredStride, piRef, uiRefStride, uiWidth, uiHeight, false );
    7366       }
    7367       else
    7368       {
    7369         uiActDist = m_pcRdCost->getDistPartVSO( pcCU, uiAbsPtIdx, piPred, uiPredStride, piRef, uiRefStride, uiWidth, uiHeight, false );
    7370       }
    7371     }
    7372     else
    7373 #endif
    7374     {
    7375       uiActDist = m_pcRdCost->getDistPart( g_bitDepthY, piPred, uiPredStride, piRef, uiRefStride, uiWidth, uiHeight, TEXT_LUMA, DF_SAD );
    7376     }
    7377 
    7378     if( uiActDist < uiBestDist || uiBestDist == RDO_DIST_MAX )
    7379     {
    7380       uiBestDist    = uiActDist;
    7381       uiBestTabIdx  = uiIdx;
    7382       iBestDeltaEnd = iTestDeltaEnd;
    7383     }
    7384     else if( uiIdx == uiBestTabIdx && abs(iTestDeltaEnd) < abs(iBestDeltaEnd) )
    7385     {
    7386       iBestDeltaEnd = iTestDeltaEnd;
    7387     }
    7388   }
    7389 
    7390   ruiTabIdx       = uiBestTabIdx;
    7391   riWedgeDeltaEnd = iBestDeltaEnd;
    7392 
    7393   cPredYuv.destroy();
    7394   return;
    7395 }
    7396 #endif
    73977308
    73987309#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.h

    r622 r646  
    213213                                  TComYuv*&   rpcYuvRec,
    214214                                  Bool        bSkipRes );
    215 #if LGE_INTER_SDC_E0156
     215#if H_3D_INTER_SDC
    216216  Void encodeResAndCalcRdInterSDCCU( TComDataCU* pcCU,
    217217    TComYuv* pcOrg,
    … …  
    352352  Void xSearchDmmDeltaDCs         ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piOrig, Pel* piPredic, UInt uiStride, Bool* biSegPattern, Int patternStride, UInt uiWidth, UInt uiHeight, Pel& rDeltaDC1, Pel& rDeltaDC2 );
    353353  Void xSearchDmm1Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx );
    354 #if !SEC_DMM2_E0146_HHIFIX
    355   Void xSearchDmm2Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, Int& riWedgeDeltaEnd );
    356 #endif
    357354#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    358355  Void xSearchDmm3Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx, UInt colTexIntraDir );

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncTop.cpp

    r637 r646  
    407407  if( picLastCoded )
    408408  {
    409 #if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
    410409    picLastCoded->compressMotion(1);
    411 #else
    412     picLastCoded->compressMotion();
    413 #endif
    414410  }
    415411#endif
Note: See TracChangeset for help on using the changeset viewer.