Changeset 876 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibEncoder


Ignore:
Timestamp:
27 Mar 2014, 18:52:26 (11 years ago)
Author:
tech
Message:

Cleanups part 1.

Location:
branches/HTM-10.1-dev0/source/Lib/TLibEncoder
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r872 r876  
    17051705        WRITE_FLAG( pcVPS->getIvMvPredFlag         ( i ) ? 1 : 0 , "iv_mv_pred_flag[i]");
    17061706#if H_3D_SPIVMP
    1707 #if SEC_SPIVMP_MCP_SIZE_G0077
    17081707        WRITE_UVLC( pcVPS->getSubPULog2Size(i)-3, "log2_sub_PU_size_minus3[i]");
    1709 #else
    1710         WRITE_UVLC( pcVPS->getSubPULog2Size(i)-2, "log2_sub_PU_size_minus2[i]");
    1711 #endif
    17121708#endif
    17131709#endif
    … …  
    17341730        if (i!=1)
    17351731        {
    1736 #if SEC_SPIVMP_MCP_SIZE_G0077
    17371732          WRITE_UVLC( pcVPS->getSubPULog2Size(i)-3, "log2_sub_PU_size_minus3[i]");
    1738 #else
    1739           WRITE_UVLC( pcVPS->getSubPULog2Size(i)-2, "log2_sub_PU_size_minus2[i]");
    1740 #endif
    17411733        }
    17421734#endif
    … …  
    17711763    }
    17721764  }
    1773 #if QC_SPIVMP_MPI_G0119
    17741765  WRITE_UVLC( pcVPS->getSubPUMPILog2Size( ) - 3, "log2_sub_PU_MPI_size_minus3");
    1775 #endif
    17761766#if H_3D_TMVP
    17771767  WRITE_FLAG( pcVPS->getIvMvScalingFlag( ) ? 1 : 0 ,          "iv_mv_scaling_flag" );

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

    r872 r876  
    397397#if H_3D_SPIVMP
    398398  Int      m_iSubPULog2Size;
    399 #endif
    400 #if QC_SPIVMP_MPI_G0119
    401399  Int      m_iSubPUMPILog2Size;
    402400#endif
    … …  
    507505  Int        getSubPULog2Size                   ()                   { return m_iSubPULog2Size;}
    508506  Void       setSubPULog2Size                   (Int u)              { m_iSubPULog2Size = u; }     
    509 #endif
    510 #if QC_SPIVMP_MPI_G0119
    511507  Int        getSubPUMPILog2Size            ()               { return m_iSubPUMPILog2Size;}
    512508  Void       setSubPUMPILog2Size            (Int u)          { m_iSubPUMPILog2Size = u;   }     

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

    r872 r876  
    582582          if (rpcTempCU->getSlice()->getIsDepth() )
    583583          {
    584 #if SEC_DEPTH_DV_DERIVAITON_G0074
    585584            DvInfo.bDV = rpcTempCU->getDispforDepth(0, 0, &DvInfo);
    586 #else
    587             DvInfo.bDV = rpcTempCU->getDispNeighBlocks(0, 0, &DvInfo);
    588 #endif
    589585          }
    590586          else
    … …  
    15331529#endif
    15341530    m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx );
    1535 #if !SEC_IC_ARP_SIG_G0072
     1531#if H_3D_ARP
     1532    m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
     1533#endif
    15361534#if H_3D_IC
    15371535    m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
    1538 #endif
    1539 #endif
    1540 #if H_3D_ARP
    1541     m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
    1542 #endif
    1543 #if SEC_IC_ARP_SIG_G0072
    1544 #if H_3D_IC
    1545     m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
    1546 #endif
    15471536#endif
    15481537    finishCU(pcCU,uiAbsPartIdx,uiDepth);
    … …  
    15701559  // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
    15711560  m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
    1572 #if !SEC_IC_ARP_SIG_G0072
     1561
     1562#if H_3D_ARP
     1563  m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
     1564#endif
    15731565#if H_3D_IC
    15741566  m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
    1575 #endif
    1576 #endif
    1577 #if H_3D_ARP
    1578   m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
    1579 #endif
    1580 #if SEC_IC_ARP_SIG_G0072
    1581 #if H_3D_IC
    1582   m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
    1583 #endif
    15841567#endif
    15851568#if H_3D_INTER_SDC && !QC_SDC_UNIFY_G0130
    … …  
    18091792#if H_3D_ARP
    18101793  Int nARPWMax = rpcTempCU->getSlice()->getARPStepNum() - 1;
    1811 #if SEC_IC_ARP_SIG_G0072
    18121794  if( nARPWMax < 0 || !rpcTempCU->getDvInfo(0).bDV || bICFlag )
    1813 #else
    1814   if( nARPWMax < 0 || !rpcTempCU->getDvInfo(0).bDV )
    1815 #endif
    18161795  {
    18171796    nARPWMax = 0;
    … …  
    21572136  Int nARPWMax    = rpcTempCU->getSlice()->getARPStepNum() - 1;
    21582137
    2159 #if SEC_IC_ARP_SIG_G0072
    21602138  if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || !rpcTempCU->getDvInfo(0).bDV || rpcTempCU->getICFlag(0) )
    2161 #else
    2162   if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || !rpcTempCU->getDvInfo(0).bDV  )
    2163 #endif
    21642139  {
    21652140    nARPWMax = 0;

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

    r872 r876  
    151151Void TEncEntropy::encodeICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    152152{
    153 #if SEC_IC_ARP_SIG_G0072
    154153  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() || pcCU->getARPW( uiAbsPartIdx ) > 0 )
    155 #else
    156   if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() )
    157 #endif
    158154  {
    159155    return;

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

    r872 r876  
    10501050  if( nBinNum > 1 )
    10511051  {
    1052 #if MTK_ARP_FLAG_CABAC_SIMP_G0061
    10531052     m_pcBinIf->encodeBin( ( iW == iMaxW ) ? 1 : 0, m_cCUPUARPWSCModel.get( 0, 0, 2 ) );
    1054 #else
    1055      m_pcBinIf->encodeBin( ( iW == iMaxW ) ? 1 : 0, m_cCUPUARPWSCModel.get( 0, 0, 3 ) );
    1056 #endif
    10571053  }
    10581054#if H_MV_ENC_DEC_TRAC
    … …  
    10721068  // get context function is here
    10731069  UInt uiSymbol = pcCU->getICFlag( uiAbsPartIdx ) ? 1 : 0;
    1074 #if MTK_IC_FLAG_CABAC_SIMP_G0061
    10751070  m_pcBinIf->encodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, 0 ) );
    1076 #else
    1077   UInt uiCtxIC  = pcCU->getCtxICFlag( uiAbsPartIdx ) ;
    1078   m_pcBinIf->encodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, uiCtxIC ) );
    1079 #endif
    10801071#if !H_MV_ENC_DEC_TRAC
    10811072  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    10821073  DTRACE_CABAC_T( "\tICFlag" );
    1083   DTRACE_CABAC_T( "\tuiCtxIC: ");
    1084   DTRACE_CABAC_V( uiCtxIC );
    10851074  DTRACE_CABAC_T( "\tuiSymbol: ");
    10861075  DTRACE_CABAC_V( uiSymbol );

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

    r872 r876  
    56165616    m_pcEntropyCoder->encodeSkipFlag(pcCU, 0, true);
    56175617    m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, true );
    5618 #if !SEC_IC_ARP_SIG_G0072
     5618#if H_3D_ARP
     5619    m_pcEntropyCoder->encodeARPW( pcCU, 0 );
     5620#endif
    56195621#if H_3D_IC
    56205622    m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    5621 #endif
    5622 #endif
    5623 #if H_3D_ARP
    5624     m_pcEntropyCoder->encodeARPW( pcCU, 0 );
    5625 #endif
    5626 #if SEC_IC_ARP_SIG_G0072
    5627 #if H_3D_IC
    5628     m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    5629 #endif
    56305623#endif
    56315624    uiBits = m_pcEntropyCoder->getNumberOfWrittenBits();
    … …  
    71767169    m_pcEntropyCoder->encodeSkipFlag(pcCU, 0, true);
    71777170    m_pcEntropyCoder->encodeMergeIndex(pcCU, 0, true);
    7178 #if !SEC_IC_ARP_SIG_G0072
     7171#if H_3D_ARP
     7172    m_pcEntropyCoder->encodeARPW( pcCU, 0 );
     7173#endif
    71797174#if H_3D_IC
    71807175    m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    7181 #endif
    7182 #endif
    7183 #if H_3D_ARP
    7184     m_pcEntropyCoder->encodeARPW( pcCU, 0 );
    7185 #endif
    7186 #if SEC_IC_ARP_SIG_G0072
    7187 #if H_3D_IC
    7188     m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    7189 #endif
    71907176#endif
    71917177    ruiBits += m_pcEntropyCoder->getNumberOfWrittenBits();
    … …  
    72057191#endif
    72067192    m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
    7207 #if !SEC_IC_ARP_SIG_G0072
     7193#if H_3D_ARP
     7194    m_pcEntropyCoder->encodeARPW( pcCU , 0 );
     7195#endif
    72087196#if H_3D_IC
    72097197    m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    7210 #endif
    7211 #endif
    7212 #if H_3D_ARP
    7213     m_pcEntropyCoder->encodeARPW( pcCU , 0 );
    7214 #endif
    7215 #if SEC_IC_ARP_SIG_G0072
    7216 #if H_3D_IC
    7217     m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
    7218 #endif
    72197198#endif
    72207199#if H_3D_INTER_SDC && !QC_SDC_UNIFY_G0130
Note: See TracChangeset for help on using the changeset viewer.