Changeset 1133 in 3DVCSoftware for trunk/source/Lib/TLibDecoder


Ignore:
Timestamp:
21 Feb 2015, 22:47:16 (10 years ago)
Author:
tech
Message:

Merged 13.0-dev0@1132

  • Cleanup
  • TICKET083_IVPFLAG_FIX
Location:
trunk/source/Lib/TLibDecoder
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1124 r1133  
    721721}
    722722
    723 #if HHI_TOOL_PARAMETERS_I2_J0107
    724723Void TDecCavlc::parseSPS(TComSPS* pcSPS)
    725 #else
    726 #if H_3D
    727 Void TDecCavlc::parseSPS(TComSPS* pcSPS, Int viewIndex, Bool depthFlag )
    728 #else
    729 Void TDecCavlc::parseSPS(TComSPS* pcSPS)
    730 #endif
    731 #endif
    732724{
    733725#if ENC_DEC_TRACE 
    … …  
    997989  if ( pcSPS->getSps3dExtensionFlag() )
    998990  {
    999 #if HHI_TOOL_PARAMETERS_I2_J0107
    1000991    parseSPS3dExtension( pcSPS );
    1001 #else
    1002     parseSPSExtension2( pcSPS, viewIndex, depthFlag  );
    1003 #endif
    1004992  }
    1005993
    … …  
    10281016
    10291017#if H_3D
    1030 #if HHI_TOOL_PARAMETERS_I2_J0107
    10311018Void TDecCavlc::parseSPS3dExtension( TComSPS* pcSPS )
    10321019{
    … …  
    10571044  }
    10581045}
    1059 #else
    1060 Void TDecCavlc::parseSPSExtension2( TComSPS* pcSPS, Int viewIndex, Bool depthFlag )
    1061 {
    1062 
    1063 }
    1064 #endif
    10651046#endif
    10661047
    … …  
    10711052  READ_FLAG( uiCode, "pps_infer_scaling_list_flag" ); pcPPS->setPpsInferScalingListFlag( uiCode == 1 );
    10721053  READ_CODE( 6, uiCode, "pps_scaling_list_ref_layer_id" ); pcPPS->setPpsScalingListRefLayerId( uiCode );
    1073 #if H_MV_HLS_FIX
    10741054
    10751055  UInt numRefLocOffsets;;
    … …  
    11121092  // This is required to equal to 0 for Multiview Main profile.
    11131093  assert( uiCode == 0 );
    1114 #else
    1115   READ_UVLC( uiCode, "num_ref_loc_offsets" ); assert( uiCode == 0 );
    1116 #endif
    11171094}
    11181095
    … …  
    12371214    {
    12381215#if H_3D
    1239 #if HHI_VPS_3D_EXTENSION_I3_J0107
    12401216      READ_FLAG( uiCode,  "vps_3d_extension_flag" );
    12411217      if ( uiCode )
    … …  
    12481224      if (uiCode)
    12491225      {     
    1250 #else
    1251       m_pcBitstream->readOutTrailingBits();
    1252       pcVPS->createCamPars(pcVPS->getNumViews());
    1253       parseVPSExtension2( pcVPS );   
    1254       READ_FLAG( uiCode,  "vps_extension3_flag" );
    1255       if (uiCode)
    1256       {     
    1257 #endif
    12581226#endif
    12591227#endif 
    … …  
    13301298  }
    13311299
    1332 #if H_MV_FIX_NUM_VIEWS
    13331300  pcVPS->initNumViews();
    1334 #endif
    13351301
    13361302  READ_CODE( 4, uiCode, "view_id_len" ); pcVPS->setViewIdLen( uiCode );
    … …  
    14411407  for( Int i = 1; i < pcVPS->getNumOutputLayerSets( ); i++ )
    14421408  {
    1443 #if H_MV_HLS_FIX
    14441409    if( pcVPS->getNumLayerSets() > 2 && i >= pcVPS->getNumLayerSets( ) )   
    1445 #else
    1446     if( i >= pcVPS->getNumLayerSets( ) )   
    1447 #endif
    14481410    {       
    14491411      READ_CODE( pcVPS->getLayerSetIdxForOlsMinus1Len( i ), uiCode, "layer_set_idx_for_ols_minus1[i]" ); pcVPS->setLayerSetIdxForOlsMinus1( i, uiCode );
    … …  
    15171479  READ_FLAG( uiCode, "max_one_active_ref_layer_flag" ); pcVPS->setMaxOneActiveRefLayerFlag ( uiCode == 1 );
    15181480
    1519 #if H_MV_HLS7_GEN || H_MV_HLS_FIX
    15201481  READ_FLAG( uiCode, "vps_poc_lsb_aligned_flag" ); pcVPS->setVpsPocLsbAlignedFlag( uiCode == 1 );
    1521 #endif
    15221482  for( Int i = 1; i  <=  pcVPS->getMaxLayersMinus1(); i++ )
    15231483  {
    … …  
    15671527    parseVPSVUI( pcVPS );
    15681528  }     
    1569 #if H_MV_HLS_FIX
    15701529  else
    1571 #endif
    15721530  {
    15731531    TComVPSVUI* pcVPSVUI = pcVPS->getVPSVUI( );
    … …  
    19451903
    19461904#if H_3D
    1947 #if HHI_VPS_3D_EXTENSION_I3_J0107
    19481905Void TDecCavlc::parseVPS3dExtension( TComVPS* pcVPS )
    1949 #else
    1950 Void TDecCavlc::parseVPSExtension2( TComVPS* pcVPS )
    1951 #endif
    19521906{
    19531907  UInt uiCode;
    19541908
    1955 #if !HHI_TOOL_PARAMETERS_I2_J0107
    1956   for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ )
    1957   {
    1958 #if H_3D_ARP
    1959     pcVPS->setUseAdvRP  ( i, 0 );
    1960     pcVPS->setARPStepNum( i, 1 );
    1961 #endif 
    1962 #if H_3D_SPIVMP
    1963     pcVPS->setSubPULog2Size(i, 0);
    1964 #endif
    1965     {
    1966 #if H_3D_IV_MERGE
    1967       READ_FLAG( uiCode, "iv_mv_pred_flag[i]");          pcVPS->setIvMvPredFlag         ( i, uiCode == 1 ? true : false );
    1968       READ_FLAG( uiCode, "iv_mv_scaling_flag[i]");       pcVPS->setIvMvScalingFlag         ( i, uiCode == 1 ? true : false );
    1969 #endif
    1970       if( !( pcVPS->getDepthId( i ) == 1 ) )
    1971       {
    1972 #if H_3D_IV_MERGE
    1973         if( !pcVPS->getNumDirectRefLayers(i) )
    1974         {
    1975           assert( !uiCode );         
    1976         }
    1977 #if H_3D_SPIVMP
    1978         READ_UVLC (uiCode, "log2_sub_PU_size_minus3[i]");     pcVPS->setSubPULog2Size(i, uiCode+3);
    1979 #endif
    1980 #endif
    1981 #if H_3D_ARP
    1982         READ_FLAG( uiCode, "iv_res_pred_flag[i]"  );       pcVPS->setUseAdvRP  ( i, uiCode ); pcVPS->setARPStepNum( i, uiCode ? H_3D_ARP_WFNR : 1 );
    1983         if( !pcVPS->getNumDirectRefLayers(i) )
    1984         {
    1985           assert( !uiCode );         
    1986         }
    1987 #endif
    1988 #if H_3D_NBDV_REF
    1989         READ_FLAG( uiCode, "depth_refinement_flag[i]");    pcVPS->setDepthRefinementFlag  ( i, uiCode == 1 ? true : false );
    1990 #endif
    1991 #if H_3D_VSP
    1992         READ_FLAG( uiCode, "view_synthesis_pred_flag[i]"); pcVPS->setViewSynthesisPredFlag( i, uiCode == 1 ? true : false );
    1993         if( !pcVPS->getNumDirectRefLayers(i) )
    1994         {
    1995           assert( !uiCode );         
    1996         }
    1997 #endif
    1998 #if H_3D_DBBP
    1999           READ_FLAG( uiCode, "use_dbbp_flag[i]" ); pcVPS->setUseDBBP( i, uiCode == 1 ? true : false );
    2000 #endif
    2001       }
    2002       else
    2003       {
    2004 #if H_3D_IV_MERGE
    2005         READ_FLAG( uiCode, "mpi_flag[i]" );             pcVPS->setMPIFlag( i, uiCode == 1 ? true : false );
    2006         READ_UVLC (uiCode, "log2_mpi_sub_PU_size_minus3[i]");     pcVPS->setSubPUMPILog2Size(i, uiCode+3);
    2007 #endif
    2008         READ_FLAG( uiCode, "vps_depth_modes_flag[i]" );             pcVPS->setVpsDepthModesFlag( i, uiCode == 1 ? true : false );
    2009 #if H_3D
    2010         READ_FLAG( uiCode, "ivp_flag[i]" );                   pcVPS->setIVPFlag( i, uiCode == 1 ? true : false );
    2011 #endif
    2012 #if H_3D_QTLPC
    2013         READ_FLAG( uiCode, "lim_qt_pred_flag[i]");                  pcVPS->setLimQtPredFlag     ( i, uiCode == 1 ? true : false );
    2014 #endif
    2015 #if H_3D_INTER_SDC
    2016             READ_FLAG( uiCode, "depth_inter_SDC_flag" );              pcVPS->setInterSDCFlag( i, uiCode ? true : false );
    2017 #endif
    2018 #if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
    2019         READ_FLAG( uiCode, "single_depth_mode_flag[i]"); pcVPS->setSingleDepthModeFlag( i, uiCode == 1 ? true : false );       
    2020 #endif
    2021       }
    2022     }
    2023   }
    2024 #endif
    20251909
    20261910  UInt uiCamParPrecision = 0;
    … …  
    21312015#endif
    21322016  rpcSlice->setSPS(sps);
    2133 #if HHI_TOOL_PARAMETERS_I2_J0107
    21342017#if H_3D
    21352018  rpcSlice->init3dToolParameters();
    2136 #endif
    21372019#endif
    21382020  rpcSlice->setPPS(pps);
    … …  
    22072089    rpcSlice->checkCrossLayerBlaFlag( );
    22082090
    2209 #if !H_MV_HLS7_GEN && !H_MV_HLS_FIX
    2210     if ( rpcSlice->getPPS()->getNumExtraSliceHeaderBits() > esb )
    2211     {
    2212       esb++;
    2213       READ_FLAG( uiCode, "poc_reset_flag" ); rpcSlice->setPocResetFlag( uiCode == 1 );
    2214     }
    2215 #endif
    22162091
    22172092    for (; esb < rpcSlice->getPPS()->getNumExtraSliceHeaderBits(); esb++)   
    … …  
    24922367    Bool interLayerPredLayerIdcPresentFlag = false;
    24932368    Int layerId       = rpcSlice->getLayerId();
    2494 #if HHI_DEPENDENCY_SIGNALLING_I1_J0107
    24952369#if H_3D
    24962370    if( rpcSlice->getLayerId() > 0 && !vps->getAllRefLayersActiveFlag() && vps->getNumRefListLayers( layerId ) > 0 )
    … …  
    24982372    if( rpcSlice->getLayerId() > 0 && !vps->getAllRefLayersActiveFlag() && vps->getNumDirectRefLayers( layerId ) > 0 )
    24992373#endif
    2500 #else
    2501     if( rpcSlice->getLayerId() > 0 && !vps->getAllRefLayersActiveFlag() && vps->getNumDirectRefLayers( layerId ) > 0 )
    2502 #endif
    25032374    {   
    25042375      READ_FLAG( uiCode, "inter_layer_pred_enabled_flag" ); rpcSlice->setInterLayerPredEnabledFlag( uiCode == 1 );
    2505 #if HHI_DEPENDENCY_SIGNALLING_I1_J0107
    25062376#if H_3D
    25072377      if( rpcSlice->getInterLayerPredEnabledFlag() && vps->getNumRefListLayers( layerId ) > 1 )
    … …  
    25092379      if( rpcSlice->getInterLayerPredEnabledFlag() && vps->getNumDirectRefLayers( layerId ) > 1 )
    25102380#endif
    2511 #else
    2512       if( rpcSlice->getInterLayerPredEnabledFlag() && vps->getNumDirectRefLayers( layerId ) > 1 )
    2513 #endif
    25142381      {           
    25152382        if( !vps->getMaxOneActiveRefLayerFlag()) 
    … …  
    25172384          READ_CODE( rpcSlice->getNumInterLayerRefPicsMinus1Len( ), uiCode, "num_inter_layer_ref_pics_minus1" ); rpcSlice->setNumInterLayerRefPicsMinus1( uiCode );
    25182385        }
    2519 #if HHI_DEPENDENCY_SIGNALLING_I1_J0107
    25202386#if H_3D
    25212387        if ( rpcSlice->getNumActiveRefLayerPics() != vps->getNumRefListLayers( layerId ) )
    2522 #else
    2523         if ( rpcSlice->getNumActiveRefLayerPics() != vps->getNumDirectRefLayers( layerId ) )
    2524 #endif
    25252388#else
    25262389        if ( rpcSlice->getNumActiveRefLayerPics() != vps->getNumDirectRefLayers( layerId ) )
    … …  
    27112574    }
    27122575#if H_3D_IC
    2713 #if HHI_DEPENDENCY_SIGNALLING_I1_J0107
    27142576    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 )
    2715 #else
    2716     else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth() && vps->getNumDirectRefLayers( layerId ) > 0 )
    2717 #endif
    27182577    {
    27192578      UInt uiCodeTmp = 0;
    … …  
    27292588    }
    27302589#endif
    2731 #if !MTK_SINGLE_DEPTH_VPS_FLAG_J0060
    2732 #if H_3D_SINGLE_DEPTH
    2733     if(rpcSlice->getIsDepth())
    2734     {
    2735       UInt uiCodeTmp = 0;
    2736       READ_FLAG( uiCodeTmp, "slice_enable_single_depth_mode" );
    2737       rpcSlice->setApplySingleDepthMode(uiCodeTmp);
    2738     }
    2739 #endif
    2740 #endif
    27412590    if (!rpcSlice->isIntra())
    27422591    {
    27432592      READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
    27442593#if H_3D_IV_MERGE
    2745 #if HHI_TOOL_PARAMETERS_I2_J0107
    2746 #if ALGIN_J0107_J0059
    27472594      rpcSlice->setMaxNumMergeCand(( ( rpcSlice->getMpiFlag() || rpcSlice->getIvMvPredFlag() || rpcSlice->getViewSynthesisPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    2748 #else
    2749       rpcSlice->setMaxNumMergeCand(( ( rpcSlice->getMpiFlag() || rpcSlice->getIvMvPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    2750 #endif
    2751 #else
    2752       if(rpcSlice->getIsDepth())
    2753       {
    2754         Bool bMPIFlag = rpcSlice->getVPS()->getMPIFlag( rpcSlice->getLayerIdInVps() ) ;
    2755         Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
    2756         rpcSlice->setMaxNumMergeCand(( ( bMPIFlag || ivMvPredFlag ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    2757       }
    2758       else
    2759       {
    2760         Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
    2761 #if MTK_MRG_LIST_SIZE_CLEANUP_J0059
    2762         Bool vspFlag = rpcSlice->getVPS()->getViewSynthesisPredFlag( rpcSlice->getLayerIdInVps() ) ;
    2763         rpcSlice->setMaxNumMergeCand(( ivMvPredFlag || vspFlag? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    2764 #else
    2765         rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    2766 #endif
    2767       }
    2768 #endif
    27692595#else
    27702596      rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);
    … …  
    29262752
    29272753    // Derive the value of PocMs8bValRequiredFlag
    2928 #if !H_MV_HLS_FIX
    2929     rpcSlice->setPocMsbValRequiredFlag( rpcSlice->getCraPicFlag() || rpcSlice->getBlaPicFlag()
    2930                                           /* || TODO related to vps_poc_lsb_aligned_flag */
    2931                                           );
    2932 #endif
    2933 
    2934 #if H_MV_HLS_FIX
     2754
    29352755    if( !rpcSlice->getPocMsbValRequiredFlag() && rpcSlice->getVPS()->getVpsPocLsbAlignedFlag() )
    2936 #else
    2937     if( !rpcSlice->getPocMsbValRequiredFlag() /* TODO &&  rpcSlice->getVPS()->getVpsPocLsbAlignedFlag() */ )
    2938 #endif
    29392756    {
    29402757      READ_FLAG( uiCode, "poc_msb_val_present_flag" ); rpcSlice->setPocMsbValPresentFlag( uiCode == 1 );

  • trunk/source/Lib/TLibDecoder/TDecCAVLC.h

    r1124 r1133  
    9090#endif
    9191#if H_3D
    92 #if HHI_VPS_3D_EXTENSION_I3_J0107
    9392  Void  parseVPS3dExtension  ( TComVPS* pcVPS );
    94 #else
    95   Void  parseVPSExtension2  ( TComVPS* pcVPS );
    96 #endif
    97 #if HHI_TOOL_PARAMETERS_I2_J0107
    9893  Void  parseSPS3dExtension ( TComSPS* pcSPS );
    9994  Void  parseSPS            ( TComSPS* pcSPS );
    100 #else
    101   Void  parseSPSExtension2  ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag );
    102   Void  parseSPS            ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag );
    103 #endif 
    10495#else
    10596  Void  parseSPS            ( TComSPS* pcSPS );

  • trunk/source/Lib/TLibDecoder/TDecCu.cpp

    r1124 r1133  
    291291  DTRACE_CU_S("=========== coding_unit ===========\n")
    292292#endif
    293 #if !LGE_DDD_REMOVAL_J0042_J0030
    294 #if H_3D_DDD
    295       pcCU->setUseDDD( false, uiAbsPartIdx, uiDepth );
    296 #endif
    297 #endif
    298293
    299294  if( (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuDQPSize() && pcCU->getSlice()->getPPS()->getUseDQP())
    … …  
    315310  {
    316311#if H_3D_ARP && H_3D_IV_MERGE
    317 #if HHI_TOOL_PARAMETERS_I2_J0107
    318312    if( pcCU->getSlice()->getIvResPredFlag() || pcCU->getSlice()->getIvMvPredFlag() )
    319 #else
    320     if( pcCU->getSlice()->getVPS()->getUseAdvRP( pcCU->getSlice()->getLayerId() ) || pcCU->getSlice()->getVPS()->getIvMvPredFlag( pcCU->getSlice()->getLayerId() ))
    321 #endif
    322313#else
    323314#if H_3D_ARP
    … …  
    349340#endif
    350341#if H_3D_NBDV_REF
    351 #if HHI_TOOL_PARAMETERS_I2_J0107
    352342      if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
    353 #else
    354       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
    356343      {
    357344        DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo, true);
    … …  
    460447#endif
    461448    pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
    462 #if !LGE_DDD_REMOVAL_J0042_J0030
    463 #if H_3D_DDD
    464     if( uiMergeIndex == m_ppcCU[uiDepth]->getUseDDDCandIdx() )
    465     {
    466         assert( pcCU->getSlice()->getViewIndex() != 0 );
    467         pcCU->setUseDDD( true, uiAbsPartIdx, 0, uiDepth );
    468         pcCU->setDDDepthSubParts( m_ppcCU[uiDepth]->getDDTmpDepth(),uiAbsPartIdx, 0, uiDepth );
    469     }
    470 #endif
    471 #endif
    472449
    473450    TComMv cTmpMv( 0, 0 );
    … …  
    744721  //construction of depth candidates
    745722  Pel testDepth;
    746 #if SINGLE_DEPTH_SIMP_J0115
    747723  Pel DepthNeighbours[2];
    748 #else
    749   Pel DepthNeighbours[5];
    750 #endif
    751724  Int index =0;
    752 #if SINGLE_DEPTH_SIMP_J0115
    753725  for( Int i = 0; (i < 2) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
    754 #else
    755   for( Int i = 0; (i < 5) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
    756 #endif
    757726  {
    758727    if(!pcCU->getNeighDepth (0, uiAbsPartIdx, &testDepth, i))
    … …  
    762731    DepthNeighbours[index]=testDepth;
    763732    index++;
    764 #if !SINGLE_DEPTH_SIMP_J0115
    765     for(Int j=0;j<index-1;j++)
    766     {
    767      if( (DepthNeighbours[index-1]==DepthNeighbours[j]) )
    768      {
    769        index--;
    770        break;
    771      }
    772     }
    773 #endif
    774733  }
    775734

  • trunk/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1124 r1133  
    5959    return;
    6060  } 
    61 #if ALIGN_J0060_J0107
    62 #else
    63   if ( !pcCU->getSlice()->getIsDepth() )
    64   {
    65     return;
    66   }
    67 #if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
    68   if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
    69   {
    70      return;
    71   }
    72 #else
    73   if(!pcCU->getSlice()->getApplySingleDepthMode())
    74   {
    75      return;
    76   }
    77 #endif
    78 #endif
    7961
    8062  m_pcEntropyDecoderIf->parseSingleDepthMode( pcCU, uiAbsPartIdx, uiDepth );
    … …  
    167149 
    168150#if H_3D_DBBP
    169 #if SEC_DBBP_VIEW_REF_CHECK_J0037
    170   #if HHI_TOOL_PARAMETERS_I2_J0107
    171151if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
    172 #else
    173 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() )
    174 #endif
    175 #else
    176   if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 )
    177 #endif
    178152  {
    179153    decodeDBBPFlag(pcCU, uiAbsPartIdx, uiDepth);
    … …  
    360334      }
    361335      pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    362 #if !LGE_DDD_REMOVAL_J0042_J0030
    363 #if H_3D_DDD
    364       if( uiMergeIndex == pcSubCU->getUseDDDCandIdx() )
    365       {
    366           assert( pcCU->getSlice()->getViewIndex() != 0 );
    367           pcCU->setUseDDD( true, uiSubPartIdx, uiPartIdx, uiDepth );
    368           pcCU->setDDDepthSubParts( pcSubCU->getDDTmpDepth(),uiSubPartIdx, uiPartIdx, uiDepth );
    369       }
    370       else
    371       {
    372           pcCU->setUseDDD( false, uiSubPartIdx, uiPartIdx, uiDepth );
    373       }
    374 #endif
    375 #endif
    376336
    377337      TComMv cTmpMv( 0, 0 );
    … …  
    852812  pcCU->setSDCFlagSubParts( false, uiAbsPartIdx, uiDepth );
    853813
    854 #if HHI_TOOL_PARAMETERS_I2_J0107
    855814  if( ( !pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getInterSdcFlag() ) ||
    856815    ( pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getIntraSdcWedgeFlag() ) )
    857 #else
    858   if( ( !pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) ) ||
    859     ( pcCU->isIntra( uiAbsPartIdx ) && !pcCU->getSlice()->getVPS()->getVpsDepthModesFlag( pcCU->getSlice()->getLayerIdInVps() ) ) )
    860 #endif
    861816  {
    862817    return;

  • trunk/source/Lib/TLibDecoder/TDecEntropy.h

    r1124 r1133  
    6666
    6767  virtual Void  parseVPS                  ( TComVPS* pcVPS )                       = 0;
    68 #if HHI_TOOL_PARAMETERS_I2_J0107
    6968  virtual Void  parseSPS                  ( TComSPS* pcSPS )                                      = 0;
    70 #else
    71 #if H_3D
    72   virtual Void  parseSPS                  ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag  )                    = 0;
    73 #else
    74   virtual Void  parseSPS                  ( TComSPS* pcSPS )                                      = 0;
    75 #endif
    76 #endif
    7769#if H_3D
    7870  virtual Void  parsePPS                  ( TComPPS* pcPPS, TComVPS* pcVPS )                      = 0;
    … …  
    161153  Void    resetEntropy                ( TComSlice* p)           { m_pcEntropyDecoderIf->resetEntropy(p);                    }
    162154  Void    decodeVPS                   ( TComVPS* pcVPS ) { m_pcEntropyDecoderIf->parseVPS(pcVPS); }
    163 #if HHI_TOOL_PARAMETERS_I2_J0107
    164155  Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
    165 #else
    166 #if H_3D
    167   Void    decodeSPS                   ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag )    { m_pcEntropyDecoderIf->parseSPS(pcSPS, viewIndex, depthFlag );                    }
    168 #else
    169   Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
    170 #endif
    171 #endif
    172156#if H_3D
    173157  Void    decodePPS                   ( TComPPS* pcPPS, TComVPS* pcVPS )    { m_pcEntropyDecoderIf->parsePPS(pcPPS, pcVPS);                    }

  • trunk/source/Lib/TLibDecoder/TDecSbac.cpp

    r1124 r1133  
    703703
    704704 
    705 #if HHI_TOOL_PARAMETERS_I2_J0107
    706705  Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
    707 #else
    708   TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
    709   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
    710 #endif
    711706  TComPic *pcTexture      = pcCU->getSlice()->getTexturePic();
    712707  Bool bDepthMapDetect    = (pcTexture != NULL);
    … …  
    762757  Bool bParsePartSize    = true;
    763758 
    764 #if HHI_TOOL_PARAMETERS_I2_J0107
    765759  Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
    766 #else
    767   TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
    768   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
    769 #endif
    770760  TComPic *pcTexture     = pcCU->getSlice()->getTexturePic();
    771761  Bool bDepthMapDetect   = (pcTexture != NULL);
    … …  
    992982  {
    993983#if H_3D_DIM
    994 #if HHI_TOOL_PARAMETERS_I2_J0107
    995984    if( pcCU->getSlice()->getIntraSdcWedgeFlag() || pcCU->getSlice()->getIntraContourFlag() )
    996 #else
    997     if( pcCU->getSlice()->getVpsDepthModesFlag() || pcCU->getSlice()->getIVPFlag() )
    998 #endif
    999985    {
    1000986      parseIntraDepth( pcCU, absPartIdx+partOffset*j, depth );
    … …  
    11111097      xParseDmm1WedgeIdx( uiTabIdx, g_dmm1TabIdxBits[pcCU->getIntraSizeIdx(absPartIdx)] );
    11121098
    1113 #if MTK_J0033
    11141099      assert( uiTabIdx < g_dmmWedgeLists[ g_aucConvertToBit[ pcCU->getDMM1BasePatternWidth( pcCU->getWidth( absPartIdx ) )]].size());
    1115 #endif
    11161100
    11171101      pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dimType, absPartIdx, depth );
    … …  
    11431127  if( uiIsDimMode )
    11441128  {
    1145 #if HHI_TOOL_PARAMETERS_I2_J0107
    11461129    if( pcCU->getSlice()->getIntraSdcWedgeFlag() && pcCU->getSlice()->getIntraContourFlag() )
    1147 #else
    1148     if( pcCU->getSlice()->getVpsDepthModesFlag() && pcCU->getSlice()->getIVPFlag() )
    1149 #endif
    11501130    {
    11511131      m_pcTDecBinIf->decodeBin( uiSymbol, m_cDepthIntraModeSCModel.get( 0, 0, 0 ) );
    … …  
    11591139      }
    11601140    }
    1161 #if HHI_TOOL_PARAMETERS_I2_J0107
    11621141    else if ( pcCU->getSlice()->getIntraSdcWedgeFlag() )
    1163 #else
    1164     else if ( pcCU->getSlice()->getVpsDepthModesFlag() )
    1165 #endif
    11661142    {
    11671143      pcCU->setLumaIntraDirSubParts( DIM_OFFSET, absPartIdx, depth );
    11681144    }
    1169 #if HHI_TOOL_PARAMETERS_I2_J0107
    11701145    else if( pcCU->getSlice()->getIntraContourFlag() )
    1171 #else
    1172     else if( pcCU->getSlice()->getIVPFlag() )
    1173 #endif
    11741146    {
    11751147      pcCU->setLumaIntraDirSubParts( ( 1+ DIM_OFFSET ), absPartIdx, depth );
    … …  
    21512123Void TDecSbac::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    21522124{
    2153 #if HHI_TOOL_PARAMETERS_I2_J0107
    21542125  AOF( pcCU->getSlice()->getDepthBasedBlkPartFlag() );
    2155 #else
    2156   AOF( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) );
    2157 #endif
    21582126  AOF( !pcCU->getSlice()->getIsDepth() );
    21592127 

  • trunk/source/Lib/TLibDecoder/TDecSbac.h

    r1124 r1133  
    7676  Void  setBitstream              ( TComInputBitstream* p  ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); }
    7777  Void  parseVPS                  ( TComVPS* /*pcVPS*/ ) {}
    78 #if HHI_TOOL_PARAMETERS_I2_J0107
    7978  Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
    80 #else
    81 #if H_3D
    82   Void  parseSPS                  ( TComSPS* /*pcSPS*/ , Int /*viewIndex*/, Bool /*depthFlag*/ ) {}
    83 #else
    84   Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
    85 #endif
    86 #endif
    8779#if H_3D
    8880  Void  parsePPS                  ( TComPPS* /*pcPPS*/, TComVPS* /*pcVPS*/ ) {}

  • trunk/source/Lib/TLibDecoder/TDecSlice.cpp

    r1124 r1133  
    280280      iNumSubstreamsPerTile = 1;
    281281    }
    282 #if LGE_DEFAULT_DV_J0046 && !SEC_ARP_VIEW_REF_CHECK_J0037 && !SEC_DBBP_VIEW_REF_CHECK_J0037
    283     pcSlice->setDefaultRefViewIdx( -1 );
    284     pcSlice->setDefaultRefViewIdxAvailableFlag( false );
    285 
    286     Int valid = 0;
    287     Int viewIndex = 0;
    288     for( UInt uiBId = 0; uiBId < pcSlice->getViewIndex() && valid==0; uiBId++ )
    289     {
    290         UInt        uiBaseId    = uiBId;
    291         TComPic*    pcBasePic   = pcSlice->getIvPic( false, uiBaseId );
    292         for( Int iRefListId = 0; ( iRefListId < (pcSlice->isInterB()? 2:1) ) && !pcSlice->isIntra() && valid==0; iRefListId++ )
    293         {
    294             RefPicList  eRefPicListTest = RefPicList( iRefListId );
    295             Int         iNumRefPics = pcSlice->getNumRefIdx( eRefPicListTest ) ;
    296             for( Int iRefIndex = 0; iRefIndex < iNumRefPics; iRefIndex++ )
    297             {
    298                 if(pcBasePic->getPOC() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getPOC()
    299                     && pcBasePic->getViewIndex() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getViewIndex())
    300                 {
    301                     valid=1;
    302                     viewIndex = uiBaseId;
    303                     break;
    304                 }
    305             }
    306         }
    307     }
    308     if( valid )
    309     {
    310         pcSlice->setDefaultRefViewIdx( viewIndex );
    311         pcSlice->setDefaultRefViewIdxAvailableFlag( true );   
    312     }
    313 #endif
    314282
    315283    if ( (iCUAddr == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getFirstCUAddr()) && // 1st in tile.

  • trunk/source/Lib/TLibDecoder/TDecTop.cpp

    r1124 r1133  
    726726
    727727#endif
    728 #if HHI_TOOL_PARAMETERS_I2_J0107
    729728#if H_3D
    730729  m_apcSlicePilot->init3dToolParameters();
    731 #endif
    732730#endif
    733731  pps->setSPS(sps);
    … …  
    10871085    pcSlice->getTempRefPicLists( m_cListPic, m_refPicSetInterLayer0, m_refPicSetInterLayer1, tempRefPicLists, usedAsLongTerm, numPocTotalCurr);
    10881086    pcSlice->setRefPicList     ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true );
    1089 
    1090 #if SEC_ARP_VIEW_REF_CHECK_J0037 || SEC_DBBP_VIEW_REF_CHECK_J0037
     1087#if H_3D
    10911088    pcSlice->setDefaultRefView();
    10921089#endif
    1093 
    10941090#if H_3D_ARP
    10951091    pcSlice->setARPStepNum(m_ivPicLists);
    … …  
    12441240  TComVPS* vps = m_parameterSetManagerDecoder.getPrefetchedVPS( 0 );
    12451241  assert( vps != 0 );
    1246 #if HHI_TOOL_PARAMETERS_I2_J0107
    12471242  m_cEntropyDecoder.decodeSPS( sps );
    1248 #else
    1249   m_cEntropyDecoder.decodeSPS( sps, vps->getViewIndex( m_layerId ), ( vps->getDepthId( m_layerId ) == 1 ) );
    1250 #endif
    12511243#else
    12521244  m_cEntropyDecoder.decodeSPS( sps );

  • trunk/source/Lib/TLibDecoder/TDecTop.h

    r1124 r1133  
    8383#endif
    8484
    85 #if !LGE_DDD_REMOVAL_J0042_J0030
    86 #if H_3D_DDD
    87   Int getCodedScale( Int iBaseView, Int iCureView){ return m_aaiCodedScale[ iBaseView ][ iCureView ];}
    88   Int getCodedOffset( Int iBaseView, Int iCureView){ return m_aaiCodedOffset[ iBaseView ][ iCureView ];}
    89   UInt getCamParsCodedPrecision(){ return m_vps->getCamParPrecision(); }
    90 #endif
    91 #endif
    9285
    9386private:
Note: See TracChangeset for help on using the changeset viewer.