Ignore:
Timestamp:
6 Nov 2014, 20:29:09 (10 years ago)
Author:
tech
Message:
  • HHI_TOOL_PARAMETERS_I2_J0107: Tool parameters moved to SPS and combined with dependency flags
  • Related update of cfg files.
Location:
branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1103 r1106  
    721721}
    722722
     723#if HHI_TOOL_PARAMETERS_I2_J0107
     724Void TDecCavlc::parseSPS(TComSPS* pcSPS)
     725#else
    723726#if H_3D
    724727Void TDecCavlc::parseSPS(TComSPS* pcSPS, Int viewIndex, Bool depthFlag )
    725728#else
    726729Void TDecCavlc::parseSPS(TComSPS* pcSPS)
     730#endif
    727731#endif
    728732{
    … …  
    993997  if ( pcSPS->getSps3dExtensionFlag() )
    994998  {
     999#if HHI_TOOL_PARAMETERS_I2_J0107
     1000    parseSPS3dExtension( pcSPS );
     1001#else
    9951002    parseSPSExtension2( pcSPS, viewIndex, depthFlag  );
     1003#endif
    9961004  }
    9971005
    … …  
    10201028
    10211029#if H_3D
     1030#if HHI_TOOL_PARAMETERS_I2_J0107
     1031Void TDecCavlc::parseSPS3dExtension( TComSPS* pcSPS )
     1032{
     1033  TComSps3dExtension* sps3dExt = pcSPS->getSps3dExtension();
     1034  UInt uiCode;
     1035  for( Int d = 0; d  <=  1; d++ )
     1036  {
     1037    READ_FLAG( uiCode, "iv_mv_pred_flag" ); sps3dExt->setIvMvPredFlag( d, uiCode == 1 );
     1038    READ_FLAG( uiCode, "iv_mv_scaling_flag" ); sps3dExt->setIvMvScalingFlag( d, uiCode == 1 );
     1039    if( d  ==  0 )
     1040    {
     1041      READ_UVLC( uiCode, "log2_sub_pb_size_minus3" ); sps3dExt->setLog2SubPbSizeMinus3( d, uiCode );
     1042      READ_FLAG( uiCode, "iv_res_pred_flag" ); sps3dExt->setIvResPredFlag( d, uiCode == 1 );
     1043      READ_FLAG( uiCode, "depth_refinement_flag" ); sps3dExt->setDepthRefinementFlag( d, uiCode == 1 );
     1044      READ_FLAG( uiCode, "view_synthesis_pred_flag" ); sps3dExt->setViewSynthesisPredFlag( d, uiCode == 1 );
     1045      READ_FLAG( uiCode, "depth_based_blk_part_flag" ); sps3dExt->setDepthBasedBlkPartFlag( d, uiCode == 1 );
     1046    }
     1047    else
     1048    {
     1049      READ_FLAG( uiCode, "mpi_flag" ); sps3dExt->setMpiFlag( d, uiCode == 1 );
     1050      READ_UVLC( uiCode, "log2_mpi_sub_pb_size_minus3" ); sps3dExt->setLog2MpiSubPbSizeMinus3( d, uiCode );
     1051      READ_FLAG( uiCode, "intra_contour_flag" ); sps3dExt->setIntraContourFlag( d, uiCode == 1 );
     1052      READ_FLAG( uiCode, "intra_sdc_wedge_flag" ); sps3dExt->setIntraSdcWedgeFlag( d, uiCode == 1 );
     1053      READ_FLAG( uiCode, "qt_pred_flag" ); sps3dExt->setQtPredFlag( d, uiCode == 1 );
     1054      READ_FLAG( uiCode, "inter_sdc_flag" ); sps3dExt->setInterSdcFlag( d, uiCode == 1 );
     1055      READ_FLAG( uiCode, "intra_single_flag" ); sps3dExt->setIntraSingleFlag( d, uiCode == 1 );
     1056    }
     1057  }
     1058}
     1059#else
    10221060Void TDecCavlc::parseSPSExtension2( TComSPS* pcSPS, Int viewIndex, Bool depthFlag )
    10231061{
    10241062
    10251063}
     1064#endif
    10261065#endif
    10271066
    … …  
    18411880{
    18421881  UInt uiCode;
     1882
     1883#if !HHI_TOOL_PARAMETERS_I2_J0107
    18431884  for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ )
    18441885  {
    … …  
    19061947    }
    19071948  }
     1949#endif
    19081950
    19091951  UInt uiCamParPrecision = 0;
    … …  
    19942036#endif
    19952037  rpcSlice->setSPS(sps);
     2038#if HHI_TOOL_PARAMETERS_I2_J0107
     2039#if H_3D
     2040  rpcSlice->init3dToolParameters();
     2041#endif
     2042#endif
    19962043  rpcSlice->setPPS(pps);
    19972044  if( pps->getDependentSliceSegmentsEnabledFlag() && ( !firstSliceSegmentInPic ))
    … …  
    25992646      READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
    26002647#if H_3D_IV_MERGE
     2648#if HHI_TOOL_PARAMETERS_I2_J0107
     2649      rpcSlice->setMaxNumMergeCand(( ( rpcSlice->getMpiFlag() || rpcSlice->getIvMvPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
     2650#else
    26012651      if(rpcSlice->getIsDepth())
    26022652      {
    … …  
    26102660        rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    26112661      }
     2662#endif
    26122663
    26132664#else

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecCAVLC.h

    r1084 r1106  
    9191#if H_3D
    9292  Void  parseVPSExtension2  ( TComVPS* pcVPS );
     93#if HHI_TOOL_PARAMETERS_I2_J0107
     94  Void  parseSPS3dExtension ( TComSPS* pcSPS );
     95  Void  parseSPS            ( TComSPS* pcSPS );
     96#else
    9397  Void  parseSPSExtension2  ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag );
    9498  Void  parseSPS            ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag );
     99#endif 
    95100#else
    96101  Void  parseSPS            ( TComSPS* pcSPS );

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecCu.cpp

    r1094 r1106  
    315315  {
    316316#if H_3D_ARP && H_3D_IV_MERGE
     317#if HHI_TOOL_PARAMETERS_I2_J0107
     318    if( pcCU->getSlice()->getIvResPredFlag() || pcCU->getSlice()->getIvMvPredFlag() )
     319#else
    317320    if( pcCU->getSlice()->getVPS()->getUseAdvRP( pcCU->getSlice()->getLayerId() ) || pcCU->getSlice()->getVPS()->getIvMvPredFlag( pcCU->getSlice()->getLayerId() ))
     321#endif
    318322#else
    319323#if H_3D_ARP
    … …  
    345349#endif
    346350#if H_3D_NBDV_REF
     351#if HHI_TOOL_PARAMETERS_I2_J0107
     352      if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
     353#else
    347354      if(pcCU->getSlice()->getVPS()->getDepthRefinementFlag( pcCU->getSlice()->getLayerIdInVps() ))  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
     355#endif
    348356      {
    349357        DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo, true);
    … …  
    10641072    }
    10651073  }
    1066  
     1074
    10671075  TextType  eText             = ( uiChromaId > 0 ? TEXT_CHROMA_V : TEXT_CHROMA_U );
    10681076  UInt      uiWidth           = pcCU     ->getWidth   ( 0 ) >> ( uiTrDepth + 1 );
    … …  
    10721080  Pel*      piPred            = ( uiChromaId > 0 ? pcPredYuv->getCrAddr( uiAbsPartIdx ) : pcPredYuv->getCbAddr( uiAbsPartIdx ) );
    10731081  Pel*      piResi            = ( uiChromaId > 0 ? pcResiYuv->getCrAddr( uiAbsPartIdx ) : pcResiYuv->getCbAddr( uiAbsPartIdx ) );
    1074  
     1082
    10751083  UInt      uiNumCoeffInc     = ( ( pcCU->getSlice()->getSPS()->getMaxCUWidth() * pcCU->getSlice()->getSPS()->getMaxCUHeight() ) >> ( pcCU->getSlice()->getSPS()->getMaxCUDepth() << 1 ) ) >> 2;
    10761084  TCoeff*   pcCoeff           = ( uiChromaId > 0 ? pcCU->getCoeffCr() : pcCU->getCoeffCb() ) + ( uiNumCoeffInc * uiAbsPartIdx );
    1077  
     1085
    10781086  UInt      uiChromaPredMode  = pcCU->getChromaIntraDir( 0 );
    1079  
     1087
    10801088  UInt      uiZOrder          = pcCU->getZorderIdxInCU() + uiAbsPartIdx;
    10811089  Pel*      piRecIPred        = ( uiChromaId > 0 ? pcCU->getPic()->getPicYuvRec()->getCrAddr( pcCU->getAddr(), uiZOrder ) : pcCU->getPic()->getPicYuvRec()->getCbAddr( pcCU->getAddr(), uiZOrder ) );
    … …  
    10881096
    10891097  pcCU->getPattern()->initAdiPatternChroma( pcCU, uiAbsPartIdx, uiTrDepth,
    1090                                            m_pcPrediction->getPredicBuf       (),
    1091                                            m_pcPrediction->getPredicBufWidth  (),
    1092                                            m_pcPrediction->getPredicBufHeight (),
    1093                                            bAboveAvail, bLeftAvail );
     1098    m_pcPrediction->getPredicBuf       (),
     1099    m_pcPrediction->getPredicBufWidth  (),
     1100    m_pcPrediction->getPredicBufHeight (),
     1101    bAboveAvail, bLeftAvail );
    10941102  Int* pPatChroma   = ( uiChromaId > 0 ? pcCU->getPattern()->getAdiCrBuf( uiWidth, uiHeight, m_pcPrediction->getPredicBuf() ) : pcCU->getPattern()->getAdiCbBuf( uiWidth, uiHeight, m_pcPrediction->getPredicBuf() ) );
    1095  
     1103
    10961104  //===== get prediction signal =====
    10971105  {
    … …  
    11081116  if ( pcCU->getCbf( uiAbsPartIdx, eText, uiTrDepth ) )
    11091117  {
    1110   //===== inverse transform =====
    1111   Int curChromaQpOffset;
    1112   if(eText == TEXT_CHROMA_U)
    1113   {
    1114     curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCbQpOffset() + pcCU->getSlice()->getSliceQpDeltaCb();
    1115   }
    1116   else
    1117   {
    1118     curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCrQpOffset() + pcCU->getSlice()->getSliceQpDeltaCr();
    1119   }
    1120   m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), eText, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), curChromaQpOffset );
    1121 
    1122   Int scalingListType = (pcCU->isIntra(uiAbsPartIdx) ? 0 : 3) + g_eTTable[(Int)eText];
     1118    //===== inverse transform =====
     1119    Int curChromaQpOffset;
     1120    if(eText == TEXT_CHROMA_U)
     1121    {
     1122      curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCbQpOffset() + pcCU->getSlice()->getSliceQpDeltaCb();
     1123    }
     1124    else
     1125    {
     1126      curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCrQpOffset() + pcCU->getSlice()->getSliceQpDeltaCr();
     1127    }
     1128    m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), eText, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), curChromaQpOffset );
     1129
     1130    Int scalingListType = (pcCU->isIntra(uiAbsPartIdx) ? 0 : 3) + g_eTTable[(Int)eText];
    11231131    assert(scalingListType < SCALING_LIST_NUM);
    1124   m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), eText, REG_DCT, piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkipChroma );
    1125 
    1126   //===== reconstruction =====
    1127   Pel* pPred      = piPred;
    1128   Pel* pResi      = piResi;
    1129   Pel* pReco      = piReco;
    1130   Pel* pRecIPred  = piRecIPred;
    1131   for( UInt uiY = 0; uiY < uiHeight; uiY++ )
    1132   {
    1133     for( UInt uiX = 0; uiX < uiWidth; uiX++ )
    1134     {
    1135       pReco    [ uiX ] = ClipC( pPred[ uiX ] + pResi[ uiX ] );
    1136       pRecIPred[ uiX ] = pReco[ uiX ];
    1137     }
    1138     pPred     += uiStride;
    1139     pResi     += uiStride;
    1140     pReco     += uiStride;
    1141     pRecIPred += uiRecIPredStride;
    1142   }
    1143 }
     1132    m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), eText, REG_DCT, piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkipChroma );
     1133
     1134    //===== reconstruction =====
     1135    Pel* pPred      = piPred;
     1136    Pel* pResi      = piResi;
     1137    Pel* pReco      = piReco;
     1138    Pel* pRecIPred  = piRecIPred;
     1139    for( UInt uiY = 0; uiY < uiHeight; uiY++ )
     1140    {
     1141      for( UInt uiX = 0; uiX < uiWidth; uiX++ )
     1142      {
     1143        pReco    [ uiX ] = ClipC( pPred[ uiX ] + pResi[ uiX ] );
     1144        pRecIPred[ uiX ] = pReco[ uiX ];
     1145      }
     1146      pPred     += uiStride;
     1147      pResi     += uiStride;
     1148      pReco     += uiStride;
     1149      pRecIPred += uiRecIPredStride;
     1150    }
     1151  }
    11441152  else
    11451153  {

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1100 r1106  
    153153#if H_3D_DBBP
    154154#if SEC_DBBP_VIEW_REF_CHECK_J0037
    155   if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
     155  #if HHI_TOOL_PARAMETERS_I2_J0107
     156if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
     157#else
     158if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
     159#endif
    156160#else
    157161  if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 )
    … …  
    833837  pcCU->setSDCFlagSubParts( false, uiAbsPartIdx, uiDepth );
    834838
     839#if HHI_TOOL_PARAMETERS_I2_J0107
     840  if( ( !pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getInterSdcFlag() ) ||
     841    ( pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getIntraSdcWedgeFlag() ) )
     842#else
    835843  if( ( !pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) ) ||
    836844    ( pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getVPS()->getVpsDepthModesFlag( pcCU->getSlice()->getLayerIdInVps() ) ) )
     845#endif
    837846  {
    838847    return;

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecEntropy.h

    r1084 r1106  
    6666
    6767  virtual Void  parseVPS                  ( TComVPS* pcVPS )                       = 0;
     68#if HHI_TOOL_PARAMETERS_I2_J0107
     69  virtual Void  parseSPS                  ( TComSPS* pcSPS )                                      = 0;
     70#else
    6871#if H_3D
    6972  virtual Void  parseSPS                  ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag  )                    = 0;
    7073#else
    7174  virtual Void  parseSPS                  ( TComSPS* pcSPS )                                      = 0;
     75#endif
    7276#endif
    7377#if H_3D
    … …  
    157161  Void    resetEntropy                ( TComSlice* p)           { m_pcEntropyDecoderIf->resetEntropy(p);                    }
    158162  Void    decodeVPS                   ( TComVPS* pcVPS ) { m_pcEntropyDecoderIf->parseVPS(pcVPS); }
     163#if HHI_TOOL_PARAMETERS_I2_J0107
     164  Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
     165#else
    159166#if H_3D
    160167  Void    decodeSPS                   ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag )    { m_pcEntropyDecoderIf->parseSPS(pcSPS, viewIndex, depthFlag );                    }
    161168#else
    162169  Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
     170#endif
    163171#endif
    164172#if H_3D

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecSbac.cpp

    r1084 r1106  
    703703
    704704  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
     705#if HHI_TOOL_PARAMETERS_I2_J0107
     706  Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
     707#else
    705708  Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
     709#endif
    706710  TComPic *pcTexture      = pcCU->getSlice()->getTexturePic();
    707711  Bool bDepthMapDetect    = (pcTexture != NULL);
    … …  
    757761  Bool bParsePartSize    = true;
    758762  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
     763#if HHI_TOOL_PARAMETERS_I2_J0107
     764  Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
     765#else
    759766  Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
     767#endif
    760768  TComPic *pcTexture     = pcCU->getSlice()->getTexturePic();
    761769  Bool bDepthMapDetect   = (pcTexture != NULL);
    … …  
    982990  {
    983991#if H_3D_DIM
     992#if HHI_TOOL_PARAMETERS_I2_J0107
     993    if( pcCU->getSlice()->getIntraSdcWedgeFlag() || pcCU->getSlice()->getIntraContourFlag() )
     994#else
    984995    if( pcCU->getSlice()->getVpsDepthModesFlag() || pcCU->getSlice()->getIVPFlag() )
     996#endif
    985997    {
    986998      parseIntraDepth( pcCU, absPartIdx+partOffset*j, depth );
    … …  
    11241136  if( uiIsDimMode )
    11251137  {
     1138#if HHI_TOOL_PARAMETERS_I2_J0107
     1139    if( pcCU->getSlice()->getIntraSdcWedgeFlag() && pcCU->getSlice()->getIntraContourFlag() )
     1140#else
    11261141    if( pcCU->getSlice()->getVpsDepthModesFlag() && pcCU->getSlice()->getIVPFlag() )
     1142#endif
    11271143    {
    11281144      m_pcTDecBinIf->decodeBin( uiSymbol, m_cDepthIntraModeSCModel.get( 0, 0, 0 ) );
    … …  
    11361152      }
    11371153    }
     1154#if HHI_TOOL_PARAMETERS_I2_J0107
     1155    else if ( pcCU->getSlice()->getIntraSdcWedgeFlag() )
     1156#else
    11381157    else if ( pcCU->getSlice()->getVpsDepthModesFlag() )
     1158#endif
    11391159    {
    11401160      pcCU->setLumaIntraDirSubParts( DIM_OFFSET, absPartIdx, depth );
    11411161    }
     1162#if HHI_TOOL_PARAMETERS_I2_J0107
     1163    else if( pcCU->getSlice()->getIntraContourFlag() )
     1164#else
    11421165    else if( pcCU->getSlice()->getIVPFlag() )
     1166#endif
    11431167    {
    11441168      pcCU->setLumaIntraDirSubParts( ( 1+ DIM_OFFSET ), absPartIdx, depth );
    … …  
    21202144Void TDecSbac::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    21212145{
     2146#if HHI_TOOL_PARAMETERS_I2_J0107
     2147  AOF( pcCU->getSlice()->getDepthBasedBlkPartFlag() );
     2148#else
    21222149  AOF( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) );
     2150#endif
    21232151  AOF( !pcCU->getSlice()->getIsDepth() );
    21242152 

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecSbac.h

    r1084 r1106  
    7676  Void  setBitstream              ( TComInputBitstream* p  ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); }
    7777  Void  parseVPS                  ( TComVPS* /*pcVPS*/ ) {}
     78#if HHI_TOOL_PARAMETERS_I2_J0107
     79  Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
     80#else
    7881#if H_3D
    7982  Void  parseSPS                  ( TComSPS* /*pcSPS*/ , Int /*viewIndex*/, Bool /*depthFlag*/ ) {}
    8083#else
    8184  Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
     85#endif
    8286#endif
    8387#if H_3D

  • branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecTop.cpp

    r1100 r1106  
    726726
    727727#endif
     728#if HHI_TOOL_PARAMETERS_I2_J0107
     729#if H_3D
     730  m_apcSlicePilot->init3dToolParameters();
     731#endif
     732#endif
    728733  pps->setSPS(sps);
    729734  pps->setNumSubstreams(pps->getEntropyCodingSyncEnabledFlag() ? ((sps->getPicHeightInLumaSamples() + sps->getMaxCUHeight() - 1) / sps->getMaxCUHeight()) * (pps->getNumTileColumnsMinus1() + 1) : 1);
    … …  
    12391244  TComVPS* vps = m_parameterSetManagerDecoder.getPrefetchedVPS( 0 );
    12401245  assert( vps != 0 );
     1246#if HHI_TOOL_PARAMETERS_I2_J0107
     1247  m_cEntropyDecoder.decodeSPS( sps );
     1248#else
    12411249  m_cEntropyDecoder.decodeSPS( sps, vps->getViewIndex( m_layerId ), ( vps->getDepthId( m_layerId ) == 1 ) );
     1250#endif
    12421251#else
    12431252  m_cEntropyDecoder.decodeSPS( sps );
Note: See TracChangeset for help on using the changeset viewer.