Changeset 1030 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibEncoder


Ignore:
Timestamp:
30 Jul 2014, 19:51:27 (11 years ago)
Author:
tech
Message:

Merged 11.2-dev2-Samsung@1026.

Location:
branches/HTM-11.2-dev0/source/Lib/TLibEncoder
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1015 r1030  
    887887{
    888888#if H_3D_QTLPC
     889#if !MTK_I0099_VPS_EX2
    889890//GT: This has to go to VPS
    890891if( depthFlag )
    … …  
    893894  WRITE_FLAG( pcSPS->getUsePC()  ? 1 : 0, "use_pc_flag");
    894895}
     896#endif
    895897#endif
    896898}
    … …  
    15581560Void TEncCavlc::codeVPSExtension2( TComVPS* pcVPS )
    15591561{
     1562#if SEC_VPS_CLEANUP_I0090
     1563  for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ )
     1564#else
    15601565  for( Int i = 0; i <= pcVPS->getMaxLayersMinus1(); i++ )
    1561   {
     1566#endif
     1567  {
     1568#if !SEC_VPS_CLEANUP_I0090
    15621569    if (i!= 0)
    1563     {
     1570#endif
     1571    {
     1572#if MTK_I0099_VPS_EX2
     1573      WRITE_FLAG( pcVPS->getIvMvPredFlag         ( i ) ? 1 : 0 , "iv_mv_pred_flag[i]");
     1574#if SEC_HLS_CLEANUP_I0100
     1575      WRITE_FLAG( pcVPS->getIvMvScalingFlag( i ) ? 1 : 0 ,       "iv_mv_scaling_flag[i]" );
     1576#endif
     1577
     1578#endif
    15641579      if ( !( pcVPS->getDepthId( i ) == 1 ) )
    15651580      {
    15661581#if H_3D_IV_MERGE
     1582#if !MTK_I0099_VPS_EX2
    15671583        WRITE_FLAG( pcVPS->getIvMvPredFlag         ( i ) ? 1 : 0 , "iv_mv_pred_flag[i]");
     1584#endif
    15681585#if H_3D_SPIVMP
    15691586        WRITE_UVLC( pcVPS->getSubPULog2Size(i)-3, "log2_sub_PU_size_minus3[i]");
    … …  
    15851602      else
    15861603      {
     1604#if !MTK_I0099_VPS_EX2
    15871605        if(i!=1)
    15881606        {
    … …  
    15951613        }
    15961614#endif
     1615#endif
    15971616#if H_3D_IV_MERGE
    15981617        WRITE_FLAG( pcVPS->getMPIFlag( i ) ? 1 : 0 ,          "mpi_flag[i]" );
     1618#endif
     1619#if MTK_I0099_VPS_EX2
     1620        WRITE_UVLC( pcVPS->getSubPUMPILog2Size(i)-3, "log2_mpi_sub_PU_size_minus3[i]");
    15991621#endif
    16001622        WRITE_FLAG( pcVPS->getVpsDepthModesFlag( i ) ? 1 : 0 ,          "vps_depth_modes_flag[i]" );
    … …  
    16021624        WRITE_FLAG( pcVPS->getIVPFlag( i ) ? 1 : 0 ,               "IVP_flag[i]" );
    16031625#endif
    1604         //WRITE_FLAG( pcVPS->getLimQtPredFlag    ( i ) ? 1 : 0 ,          "lim_qt_pred_flag[i]"     );
     1626#if MTK_I0099_VPS_EX2
     1627        WRITE_FLAG( pcVPS->getLimQtPredFlag    ( i ) ? 1 : 0 ,          "lim_qt_pred_flag[i]"     );
     1628#endif
     1629
    16051630#if H_3D_INTER_SDC
    16061631        WRITE_FLAG( pcVPS->getInterSDCFlag( i ) ? 1 : 0, "depth_inter_SDC_flag" );
    … …  
    16101635  }
    16111636  WRITE_UVLC( pcVPS->getCamParPrecision(), "cp_precision" );
     1637#if SEC_VPS_CLEANUP_I0090
     1638  for (UInt viewIndex=1; viewIndex<pcVPS->getNumViews(); viewIndex++)
     1639#else
    16121640  for (UInt viewIndex=0; viewIndex<pcVPS->getNumViews(); viewIndex++)
     1641#endif
    16131642  {
    16141643    WRITE_FLAG( pcVPS->getCamParPresent(viewIndex) ? 1 : 0, "cp_present_flag[i]" );
    … …  
    16281657    }
    16291658  }
     1659#if !MTK_I0099_VPS_EX2
    16301660  WRITE_UVLC( pcVPS->getSubPUMPILog2Size( ) - 3, "log2_sub_PU_MPI_size_minus3");
     1661#endif
    16311662#if H_3D_TMVP
     1663#if !SEC_HLS_CLEANUP_I0100
    16321664  WRITE_FLAG( pcVPS->getIvMvScalingFlag( ) ? 1 : 0 ,          "iv_mv_scaling_flag" );
     1665#endif
    16331666#endif
    16341667}
    … …  
    20162049    }
    20172050#if H_3D_IC
     2051#if SEC_HLS_CLEANUP_I0100
     2052    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() && vps->getNumDirectRefLayers( layerId ) > 0 )
     2053#else
    20182054    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth())
     2055#endif
    20192056    {
    20202057      WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" );

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

    r1015 r1030  
    426426  Bool      m_useMPI;
    427427#endif
     428#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    428429#if H_3D_QTLPC
    429430  Bool      m_bUseQTL;
     431#if !MTK_I0099_VPS_EX2
    430432  Bool      m_bUsePC;
     433#endif
     434#endif
    431435#endif
    432436#endif
    … …  
    10221026  Bool       getUseSingleDepthMode          ()               { return m_useSingleDepthMode; }
    10231027#endif
     1028#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    10241029#if H_3D_QTLPC
    10251030  Void      setUseQTL                       ( Bool b ) { m_bUseQTL = b;    }
    10261031  Bool      getUseQTL                       ()         { return m_bUseQTL; }
     1032#if !MTK_I0099_VPS_EX2
    10271033  Void      setUsePC                        ( Bool b ) { m_bUsePC  = b;    }
    10281034  Bool      getUsePC                        ()         { return m_bUsePC;  }
     1035#endif
     1036#endif
    10291037#endif
    10301038#if H_3D_IV_MERGE

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

    r1029 r1030  
    409409
    410410#if H_3D_QTLPC
     411#if MTK_I0099_VPS_EX2
     412  TComVPS *vps            = pcPic->getSlice(0)->getVPS();
     413  Bool  bLimQtPredFalg    = vps->getLimQtPredFlag(pcPic->getSlice(0)->getLayerId());
     414#else
    411415  TComSPS *sps            = pcPic->getSlice(0)->getSPS();
     416#endif
    412417  TComPic *pcTexture      = rpcBestCU->getSlice()->getTexturePic();
    413418
    … …  
    531536      //logic for setting bTrySplit using the partition information that is stored of the texture colocated CU
    532537
     538#if MTK_I0099_VPS_EX2
     539#if MTK_I0099_FIX
     540      if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
     541#else
     542      if(depthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFalg)
     543#endif
     544#else
    533545      if(depthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTL())
     546#endif
    534547      {
    535548        TComDataCU* pcTextureCU = pcTexture->getCU( rpcBestCU->getAddr() ); //Corresponding texture LCU
    … …  
    685698
    686699#if H_3D_QTLPC     
     700#if MTK_I0099_VPS_EX2
     701#if MTK_I0099_FIX
     702      if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
     703#else
     704      if(depthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFalg)
     705#endif
     706#else
    687707      if(depthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTL())
     708#endif
    688709      {
    689710        bTrySplitDQP = bTrySplit;

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

    r1029 r1030  
    714714  PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
    715715#if H_3D_QTLPC
     716#if MTK_I0099_VPS_EX2
     717  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
     718  Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
     719#else
    716720  TComSPS *sps           = pcCU->getPic()->getSlice(0)->getSPS();
     721#endif
    717722  TComPic *pcTexture     = pcCU->getSlice()->getTexturePic();
    718723  Bool bDepthMapDetect   = (pcTexture != NULL);
    … …  
    723728  Bool depthDependent = false;
    724729  UInt uiTexturePart = eSize;
     730#if MTK_I0099_VPS_EX2
     731  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && bLimQtPredFlag )
     732#else
    725733  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && sps->getUseQTL() && sps->getUsePC() )
     734#endif
    726735  {
    727736    TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
    … …  
    10811090  Bool bCodeSplitFlag    = true;
    10821091
     1092#if MTK_I0099_VPS_EX2
     1093  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
     1094  Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
     1095#else
    10831096  TComSPS *sps           = pcCU->getPic()->getSlice(0)->getSPS();
     1097#endif
    10841098  TComPic *pcTexture     = pcCU->getSlice()->getTexturePic();
    10851099  Bool bDepthMapDetect   = (pcTexture != NULL);
    … …  
    10881102  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    10891103
     1104#if MTK_I0099_VPS_EX2
     1105  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && bLimQtPredFlag  )
     1106#else
    10901107  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && sps->getUseQTL() && sps->getUsePC())
     1108#endif
    10911109  {
    10921110    TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());

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

    r976 r1030  
    744744  m_cSPS.setUseAMP ( m_useAMP );
    745745
     746#if !MTK_I0099_VPS_EX2
    746747#if H_3D_QTLPC
    747748  m_cSPS.setUseQTL( m_bUseQTL );
    748749  m_cSPS.setUsePC ( m_bUsePC  );
     750#endif
    749751#endif
    750752
Note: See TracChangeset for help on using the changeset viewer.