Changeset 1122 in 3DVCSoftware


Ignore:
Timestamp:
8 Nov 2014, 21:54:17 (9 years ago)
Author:
tech
Message:

Alignment of J0060 and J0107 (ALIGN_J0060_J0107)

Location:
branches/HTM-12.2-dev0/source/Lib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-12.2-dev0/source/Lib/TLibCommon/TypeDef.h

    r1118 r1122  
    237237#define H_3D_SINGLE_DEPTH                 1   // Single depth mode proposed in JCT3V-I0095
    238238#define MTK_SINGLE_DEPTH_VPS_FLAG_J0060   1   // Add VPS control flags and remove slice header control flag for single depth, JCT3V-J0060
     239#define ALIGN_J0060_J0107                 1   // Aligment of changed tool parameters
    239240
    240241#define MTK_J0033                         1
  • branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1120 r1122  
    5555Void TDecEntropy::decodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    5656{
     57  if( !pcCU->getSlice()->getIntraSingleFlag() )
     58  {
     59    return;
     60  } 
     61#if ALIGN_J0060_J0107
     62#else
    5763  if ( !pcCU->getSlice()->getIsDepth() )
    5864  {
     
    6066  }
    6167#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
    62 //  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
     68  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
    6369  {
    6470     return;
     
    7076  }
    7177#endif
     78#endif
     79
    7280  m_pcEntropyDecoderIf->parseSingleDepthMode( pcCU, uiAbsPartIdx, uiDepth );
    7381}
  • branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r1120 r1122  
    740740    rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
    741741#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
    742 //    if(rpcBestCU->getSlice()->getVPS()->getSingleDepthModeFlag(rpcBestCU->getSlice()->getLayerIdInVps()))
     742#if ALIGN_J0060_J0107
     743    if( rpcBestCU->getSlice()->getIntraSingleFlag() )
     744#else
     745    if(rpcBestCU->getSlice()->getVPS()->getSingleDepthModeFlag(rpcBestCU->getSlice()->getLayerIdInVps()))
     746#endif
    743747#else
    744748    if(rpcBestCU->getSlice()->getApplySingleDepthMode())
  • branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1120 r1122  
    130130Void TEncEntropy::encodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    131131{
     132#if ALIGN_J0060_J0107
     133  if(!pcCU->getSlice()->getIntraSingleFlag() )
     134  {
     135    return;
     136  }
     137#else
    132138  if ( !pcCU->getSlice()->getIsDepth() )
    133139  {
     
    135141  }
    136142#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
    137 //  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
     143  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
    138144  {
    139145     return;
     
    144150     return;
    145151  }
     152#endif
    146153#endif
    147154  if( bRD )
Note: See TracChangeset for help on using the changeset viewer.