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

minor fix:

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

Legend:

Unmodified
Added
Removed

  • 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.