Changeset 374 in 3DVCSoftware for branches/HTM-6.2-dev1-Sharp/source/Lib


Ignore:
Timestamp:
5 May 2013, 12:09:11 (11 years ago)
Author:
sharpjp-htm
Message:

D0060: Removal of IC's parsing dependency

Location:
branches/HTM-6.2-dev1-Sharp/source/Lib
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

    r355 r374  
    30033003  UInt iNumbPart;
    30043004
     3005#if SHARP_ILLUCOMP_PARSE_D0060
     3006  if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N))
     3007  {
     3008    return false;
     3009  }
     3010  if (getSlice()->getIcSkipParseFlag())
     3011  {
     3012    if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0)
     3013    {
     3014      return false;
     3015    }
     3016  }
     3017  if (getMergeFlag(uiAbsPartIdx))
     3018  {
     3019    return true;
     3020  }
     3021#endif
     3022#if HHI_MPI
    30053023  if(!getSlice()->getIsDepth())
    30063024  {
     3025#endif
    30073026    Int iWidth, iHeight;
    30083027
     
    30253044      }
    30263045    }
     3046#if HHI_MPI
    30273047  }
    30283048  else
     
    30463066    }
    30473067  }
     3068#endif
    30483069
    30493070  return false;
     
    30563077  Int iWidth, iHeight;
    30573078
     3079#if SHARP_ILLUCOMP_PARSE_D0060
     3080  if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N))
     3081  {
     3082    return false;
     3083  }
     3084  if (getSlice()->getIcSkipParseFlag())
     3085  {
     3086    if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0)
     3087    {
     3088      return false;
     3089    }
     3090  }
     3091  if (getMergeFlag(uiAbsPartIdx))
     3092  {
     3093    return true;
     3094  }
     3095#endif
    30583096  UInt uiPartMode = getPartitionSize(uiAbsPartIdx);
    30593097
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComSlice.cpp

    r332 r374  
    113113#if LGE_ILLUCOMP_B0045
    114114, m_bApplyIC                      ( false )
     115#if SHARP_ILLUCOMP_PARSE_D0060
     116, m_icSkipParseFlag               ( false )
     117#endif
    115118#endif
    116119#if INTER_VIEW_VECTOR_SCALING_C0115
     
    827830
    828831  m_bLMvdL1Zero = pSrc->m_bLMvdL1Zero;
     832#if LGE_ILLUCOMP_B0045
     833  m_bApplyIC = pSrc->m_bApplyIC;
     834#if SHARP_ILLUCOMP_PARSE_D0060
     835  m_icSkipParseFlag = pSrc->m_icSkipParseFlag;
     836#endif
     837#endif
    829838}
    830839
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComSlice.h

    r332 r374  
    11061106#if LGE_ILLUCOMP_B0045
    11071107  Bool        m_bApplyIC;
     1108#if SHARP_ILLUCOMP_PARSE_D0060
     1109  Bool        m_icSkipParseFlag;
     1110#endif
    11081111#endif
    11091112#if INTER_VIEW_VECTOR_SCALING_C0115|QC_MVHEVC_B0046
     
    14011404  Bool      getApplyIC            ()  { return m_bApplyIC; }
    14021405  Void      xSetApplyIC           ();
     1406#if SHARP_ILLUCOMP_PARSE_D0060
     1407  Void      setIcSkipParseFlag( Bool b ) { m_icSkipParseFlag = b; }
     1408  Bool      getIcSkipParseFlag() { return m_icSkipParseFlag; }
     1409#endif
    14031410#endif
    14041411#if QC_TMVP_MRG_REFIDX_C0047
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TypeDef.h

    r355 r374  
    143143#endif
    144144#endif
     145
     146#define SHARP_ILLUCOMP_PARSE_D0060        1   // JCT3V-D0060 Removal of IC's parsing dependency
    145147
    146148///// ***** INTERVIEW SKIP *********
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r332 r374  
    16651665    }
    16661666    rpcSlice->setApplyIC(uiCodeTmp);
     1667#if SHARP_ILLUCOMP_PARSE_D0060
     1668    if (rpcSlice->getApplyIC())
     1669    {
     1670      READ_FLAG (uiCodeTmp, "ic_skip_mergeidx0");
     1671      rpcSlice->setIcSkipParseFlag(uiCodeTmp);
     1672    }
     1673#endif
    16671674  }
    16681675#endif
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder/TEncCavlc.cpp

    r332 r374  
    790790      WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "applying IC flag" );
    791791    }
     792#if SHARP_ILLUCOMP_PARSE_D0060
     793    if (pcSlice->getApplyIC())
     794    {
     795      WRITE_FLAG( pcSlice->getIcSkipParseFlag() ? 1 : 0, "ic_skip_mergeidx0" );
     796    }
     797#endif
    792798  }
    793799#endif
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder/TEncCu.cpp

    r355 r374  
    665665
    666666#if LGE_ILLUCOMP_B0045
     667#if SHARP_ILLUCOMP_PARSE_D0060
     668    bICEnabled = false;
     669#else
    667670    bICEnabled = rpcBestCU->getICFlag(0);
     671#endif
    668672#endif
    669673
     
    720724          Bool bResPredFlag  = ( uiResPrdId > 0 );
    721725#if LGE_ILLUCOMP_B0045
     726#if SHARP_ILLUCOMP_PARSE_D0060
     727          {
     728            Bool bICFlag = false;
     729            rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
     730#else
    722731          for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)
    723732          {
    724733            Bool bICFlag = (uiICId ? true : false);
    725734            rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
     735#endif
    726736#endif
    727737#endif
     
    18751885    {
    18761886      TComYuv* pcPredYuvTemp = NULL;
     1887#if SHARP_ILLUCOMP_PARSE_D0060
     1888      if (rpcTempCU->getSlice()->getApplyIC() && rpcTempCU->getSlice()->getIcSkipParseFlag())
     1889      {
     1890        if (bICFlag && uiMergeCand == 0)
     1891        {
     1892          continue;
     1893        }
     1894      }
     1895#endif
    18771896#if LOSSLESS_CODING
    18781897      UInt iteration;
  • branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder/TEncSlice.cpp

    r332 r374  
    778778  {
    779779    pcSlice ->xSetApplyIC();
     780#if SHARP_ILLUCOMP_PARSE_D0060
     781    if (pcSlice->getApplyIC())
     782    {
     783      pcSlice->setIcSkipParseFlag(rpcPic->getCurrSlice()->getPOC() % m_pcCfg->getIntraPeriod() != 0);
     784    }
     785#endif
    780786  }
    781787#endif
Note: See TracChangeset for help on using the changeset viewer.