Changeset 156 in 3DVCSoftware


Ignore:
Timestamp:
29 Oct 2012, 02:20:31 (11 years ago)
Author:
lg
Message:

minor fix:

  1. indentation correction,
  2. remove outcommented source lines
Location:
branches/HTM-4.1-dev2-LG/source
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-4.1-dev2-LG/source/App/TAppEncoder/TAppEncTop.cpp

    r152 r156  
    301301    m_acTEncTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[0]     );
    302302#if LGE_ILLUCOMP_B0045
    303   m_acTEncTopList[iViewIdx]->setUseIC                ( m_bUseIC          );
     303    m_acTEncTopList[iViewIdx]->setUseIC                ( m_bUseIC          );
    304304#endif
    305305#if SAO_UNIT_INTERLEAVING
     
    583583      m_acTEncDepthTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[1]     );
    584584#if LGE_ILLUCOMP_B0045
    585     m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
     585      m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
    586586#endif
    587587#if SAO_UNIT_INTERLEAVING
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/ContextTables.h

    r152 r156  
    187187#if LGE_ILLUCOMP_B0045
    188188static const UChar
    189   INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] = 
     189INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] = 
    190190{
    191191  { CNU,  CNU,  CNU, },
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/TComDataCU.cpp

    r152 r156  
    213213    m_pbMergeFlag        = (Bool*  )xMalloc(Bool,   uiNumPartition);
    214214#if LGE_ILLUCOMP_B0045
    215   m_pbICFlag           = (Bool*  )xMalloc(Bool,   uiNumPartition);
     215    m_pbICFlag           = (Bool*  )xMalloc(Bool,   uiNumPartition);
    216216#endif
    217217    m_puhMergeIndex      = (UChar* )xMalloc(UChar,  uiNumPartition);
     
    362362    if ( m_pbMergeFlag        ) { xFree(m_pbMergeFlag);         m_pbMergeFlag       = NULL; }
    363363#if LGE_ILLUCOMP_B0045
    364   if ( m_pbICFlag           ) { xFree(m_pbICFlag);            m_pbICFlag          = NULL; }
     364    if ( m_pbICFlag           ) { xFree(m_pbICFlag);            m_pbICFlag          = NULL; }
    365365#endif
    366366    if ( m_puhMergeIndex      ) { xFree(m_puhMergeIndex);       m_puhMergeIndex     = NULL; }
     
    558558    m_pbMergeFlag[ui]=pcFrom->m_pbMergeFlag[ui];
    559559#if LGE_ILLUCOMP_B0045
    560   m_pbICFlag[ui]=pcFrom->m_pbICFlag[ui];
     560    m_pbICFlag[ui]=pcFrom->m_pbICFlag[ui];
    561561#endif
    562562    m_puhMergeIndex[ui]=pcFrom->m_puhMergeIndex[ui];
     
    593593    memset( m_pbMergeFlag       + firstElement, false,                    numElements * sizeof( *m_pbMergeFlag ) );
    594594#if LGE_ILLUCOMP_B0045
    595   memset( m_pbICFlag          + firstElement, false,                    numElements * sizeof( *m_pbICFlag ) );
     595    memset( m_pbICFlag          + firstElement, false,                    numElements * sizeof( *m_pbICFlag ) );
    596596#endif
    597597    memset( m_puhMergeIndex     + firstElement, 0,                        numElements * sizeof( *m_puhMergeIndex ) );
     
    779779      m_pbMergeFlag[ui] = 0;
    780780#if LGE_ILLUCOMP_B0045
    781     m_pbICFlag[ui]    = false;
     781      m_pbICFlag[ui]    = false;
    782782#endif
    783783      m_puhMergeIndex[ui] = 0;
     
    961961      m_pbMergeFlag[ui]=pcCU->m_pbMergeFlag[uiPartOffset+ui];
    962962#if LGE_ILLUCOMP_B0045
    963     m_pbICFlag[ui]=pcCU->m_pbICFlag[uiPartOffset+ui];
     963      m_pbICFlag[ui]=pcCU->m_pbICFlag[uiPartOffset+ui];
    964964#endif
    965965      m_puhMergeIndex[ui]=pcCU->m_puhMergeIndex[uiPartOffset+ui];
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/TComPrediction.cpp

    r152 r156  
    629629    {
    630630#if LGE_ILLUCOMP_B0045
    631     if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
     631      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
    632632#else
    633633      if( pcCU->getSlice()->getPPS()->getUseWP())
     
    649649      }
    650650#if LGE_ILLUCOMP_B0045
    651     if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr) )
     651      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr) )
    652652#else
    653653      if ( pcCU->getSlice()->getPPS()->getUseWP() )
     
    698698    {
    699699#if LGE_ILLUCOMP_B0045
    700     if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
     700      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
    701701#else
    702702      if( pcCU->getSlice()->getPPS()->getUseWP())
     
    723723#endif 
    724724#if LGE_ILLUCOMP_B0045
    725     if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
     725      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
    726726#else
    727727      if ( pcCU->getSlice()->getPPS()->getUseWP() )
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/TComSlice.cpp

    r152 r156  
    13701370      iSumOrgSAD += abs(aiCurrHist[i] - aiRefOrgHist[i]);
    13711371    }
    1372     //printf("iSumOrgSAD : %d\n",iSumOrgSAD);
    13731372    // Setting
    13741373    if ( iSumOrgSAD > Int(dThresholdOrgSAD * iWidth * iHeight) )
    13751374    {
    13761375      m_bApplyIC = true;
    1377       //printf("ApplyIC\n");
    13781376    }
    13791377    else
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibDecoder/TDecCu.cpp

    r152 r156  
    390390    }
    391391#if LGE_ILLUCOMP_B0045
    392   m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
     392    m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
    393393#endif
    394394#if HHI_MPI
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp

    r153 r156  
    735735          Bool bResPredFlag  = ( uiResPrdId > 0 );
    736736#if LGE_ILLUCOMP_B0045
    737       for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)
    738       {
    739         Bool bICFlag = (uiICId ? true : false);
    740         rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
     737          for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)
     738          {
     739            Bool bICFlag = (uiICId ? true : false);
     740            rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
    741741#endif
    742742#endif
     
    763763          }
    764764#if LGE_ILLUCOMP_B0045_ENCSIMP
    765       if(bICFlag && rpcBestCU->getMergeFlag(0) && !rpcBestCU->getICFlag(0))
    766       {
    767         bICEnabled = false;
    768         break;
    769       }
     765          if(bICFlag && rpcBestCU->getMergeFlag(0) && !rpcBestCU->getICFlag(0))
     766          {
     767             bICEnabled = false;
     768             break;
     769          }
    770770#endif
    771771          // 2Nx2N, NxN
     
    788788          }
    789789#if LGE_ILLUCOMP_B0045
    790       }
     790         }
    791791#endif
    792792#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    877877          Bool bResPredFlag  = ( uiResPrdId > 0 );
    878878#if LGE_ILLUCOMP_B0045
    879       for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)
    880       {
    881         Bool bICFlag = (uiICId ? true : false);
    882         rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
     879          for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)
     880          {
     881            Bool bICFlag = (uiICId ? true : false);
     882            rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
    883883#endif
    884884#endif
     
    14181418#endif
    14191419#if LGE_ILLUCOMP_B0045
    1420     }
     1420         }
    14211421#endif
    14221422#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    14461446        {
    14471447#if LGE_ILLUCOMP_B0045
    1448       rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);
     1448          rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);
    14491449#endif
    14501450          xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
     
    14661466                {
    14671467#if LGE_ILLUCOMP_B0045
    1468           rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);
     1468                  rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);
    14691469#endif
    14701470                  xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN   );
     
    15021502        {
    15031503#if LGE_ILLUCOMP_B0045
    1504       rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);
     1504          rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);
    15051505#endif
    15061506          xCheckIntraPCM (rpcBestCU, rpcTempCU);
     
    21482148    m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx, 0 );
    21492149#if LGE_ILLUCOMP_B0045
    2150   m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
     2150    m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
    21512151#endif
    21522152#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    21792179  m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
    21802180#if LGE_ILLUCOMP_B0045
    2181   m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
     2181    m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
    21822182#endif
    21832183#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    23032303#endif
    23042304#if LGE_ILLUCOMP_B0045
    2305       rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uhDepth);
     2305          rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uhDepth);
    23062306#endif
    23072307
     
    32183218    m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, 0, true );
    32193219#if LGE_ILLUCOMP_B0045
    3220   m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
     3220    m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    32213221#endif
    32223222  }
     
    32283228    m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
    32293229#if LGE_ILLUCOMP_B0045
    3230   m_pcEntropyCoder->encodeICFlag( pcCU, 0,          true );
     3230    m_pcEntropyCoder->encodeICFlag( pcCU, 0,          true );
    32313231#endif
    32323232  }
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibEncoder/TEncSbac.cpp

    r152 r156  
    231231      curCost += m_cCUSkipFlagSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_SKIP_FLAG );
    232232#if LGE_ILLUCOMP_B0045
    233     curCost += m_cCUICFlagSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_IC_FLAG );
     233      curCost += m_cCUICFlagSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_IC_FLAG );
    234234#endif
    235235      curCost += m_cCUAlfCtrlFlagSCModel.calcCost     ( curSliceType, qp, (UChar*)INIT_ALF_CTRL_FLAG );
  • branches/HTM-4.1-dev2-LG/source/Lib/TLibEncoder/TEncSearch.cpp

    r152 r156  
    721721    m_cDistParam.pCur = piRefPos;
    722722#if LGE_ILLUCOMP_B0045
    723   m_cDistParam.bUseIC = pcPatternKey->getICFlag();
     723    m_cDistParam.bUseIC = pcPatternKey->getICFlag();
    724724#endif
    725725    uiDist = m_cDistParam.DistFunc( &m_cDistParam );
     
    41244124
    41254125#if LGE_ILLUCOMP_B0045
    4126     m_cDistParam.bUseIC = pcPatternKey->getICFlag();
     4126      m_cDistParam.bUseIC = pcPatternKey->getICFlag();
    41274127#endif
    41284128      uiSad = m_cDistParam.DistFunc( &m_cDistParam );
     
    44834483    m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, 0, true );
    44844484#if LGE_ILLUCOMP_B0045
    4485   m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
     4485    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
    44864486#endif
    44874487#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    58515851    m_pcEntropyCoder->encodeMergeIndex(pcCU, 0, 0, true);
    58525852#if LGE_ILLUCOMP_B0045
    5853   m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
     5853    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
    58545854#endif
    58555855#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    58745874    m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
    58755875#if LGE_ILLUCOMP_B0045
    5876   m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
     5876    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
    58775877#endif
    58785878#if HHI_INTER_VIEW_RESIDUAL_PRED
Note: See TracChangeset for help on using the changeset viewer.