Changeset 755 in SHVCSoftware for branches


Ignore:
Timestamp:
29 Apr 2014, 23:47:35 (11 years ago)
Author:
seregin
Message:

remove macro N0120_MAX_TID_REF_PRESENT_FLAG

Location:
branches/SHM-6-dev/source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r754 r755  
    11071107    }
    11081108#endif
    1109 #if N0120_MAX_TID_REF_PRESENT_FLAG
    11101109#if N0120_MAX_TID_REF_CFG
    11111110  vps->setMaxTidRefPresentFlag(m_maxTidRefPresentFlag);
    … …  
    11521151    }
    11531152  }
    1154 #endif
    11551153#if ILP_SSH_SIG
    11561154#if ILP_SSH_SIG_FIX

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp

    r753 r755  
    23382338  m_crossLayerAlignedIdrOnlyFlag = false;
    23392339#endif
    2340 #if N0120_MAX_TID_REF_PRESENT_FLAG
    23412340  m_maxTidRefPresentFlag = true;
    2342 #endif
    23432341  for( Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1 - 1; i++)
    23442342  {

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h

    r744 r755  
    580580  UInt       m_maxTidIlRefPicsPlus1[MAX_VPS_LAYER_ID_PLUS1 - 1];
    581581#endif
    582 #if N0120_MAX_TID_REF_PRESENT_FLAG
    583582  Bool       m_maxTidRefPresentFlag;
    584 #endif
    585583#if VPS_TSLAYERS
    586584  Bool       m_maxTSLayersPresentFlag;
    … …  
    944942  Void   setMaxTidIlRefPicsPlus1(Int layerId, UInt maxSublayer)   { m_maxTidIlRefPicsPlus1[layerId] = maxSublayer;            }
    945943#endif
    946 #if N0120_MAX_TID_REF_PRESENT_FLAG
    947944  Bool   getMaxTidRefPresentFlag()                                  { return m_maxTidRefPresentFlag ;}
    948945  Void   setMaxTidRefPresentFlag(Bool x)                            { m_maxTidRefPresentFlag = x;}
    949 #endif
    950946#if VPS_TSLAYERS
    951947  Bool   getMaxTSLayersPresentFlag()                                  { return m_maxTSLayersPresentFlag ;}

  • branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h

    r754 r755  
    197197#define EARLY_REF_PIC_MARKING            0      ///< Valencia meeting - remove early marking of inter-layer reference pictures
    198198                                                ///< Decoded picture marking of sub-layer non-reference pictures
    199 #define N0120_MAX_TID_REF_PRESENT_FLAG   1      ///< JCTVC-N0120: max_tid_ref_pics_plus1_present_flag
    200199#define N0120_MAX_TID_REF_CFG            1      ///< set max_tid_il_ref_pics_plus1 and max_tid_ref_present_flag in the config. file (configuration setting)
    201200#define O0225_MAX_TID_FOR_REF_LAYERS     1

  • branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r744 r755  
    12041204  }
    12051205#endif
    1206 #if N0120_MAX_TID_REF_PRESENT_FLAG
    12071206  READ_FLAG( uiCode, "max_tid_ref_present_flag"); vps->setMaxTidRefPresentFlag(uiCode ? true : false);
    12081207  if (vps->getMaxTidRefPresentFlag())
    … …  
    12431242    }
    12441243  }
    1245 #else
    1246   for(i = 0; i < vps->getMaxLayers() - 1; i++)
    1247   {
    1248 #if O0225_MAX_TID_FOR_REF_LAYERS
    1249        for( j = i+1; j <= vps->getMaxLayers() - 1; j++)
    1250        {
    1251          if(vps->getDirectDependencyFlag(j, i))
    1252          {
    1253            READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i][j]" ); vps->setMaxTidIlRefPicsPlus1(i, j, uiCode);
    1254            assert( uiCode <= vps->getMaxTLayers() );
    1255          }
    1256        }
    1257 #else
    1258     READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i]" ); vps->setMaxTidIlRefPicsPlus1(i, uiCode);
    1259     assert( uiCode <= vps->getMaxTLayers() );
    1260 #endif   
    1261   }
    1262 #endif
    12631244#if ILP_SSH_SIG
    12641245    READ_FLAG( uiCode, "all_ref_layers_active_flag" ); vps->setIlpSshSignalingEnabledFlag(uiCode ? true : false);

  • branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r744 r755  
    957957    }
    958958#endif
    959 #if N0120_MAX_TID_REF_PRESENT_FLAG
    960959   WRITE_FLAG( vps->getMaxTidRefPresentFlag(), "max_tid_ref_present_flag");
    961960   if (vps->getMaxTidRefPresentFlag())
    … …  
    976975     }
    977976   }
    978 #else
    979   for( i = 0; i < vps->getMaxLayers() - 1; i++)
    980   {
    981 #if O0225_MAX_TID_FOR_REF_LAYERS
    982        for( j = i+1; j <= vps->getMaxLayers() - 1; j++)
    983        {
    984          if(vps->getDirectDependencyFlag(j, i))
    985          {
    986            WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i,j), 3, "max_tid_il_ref_pics_plus1[i][j]" );
    987          }
    988        }
    989 #else
    990     WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i), 3, "max_tid_il_ref_pics_plus1[i]" );
    991 #endif
    992   }
    993 #endif
    994977#if ILP_SSH_SIG
    995978    WRITE_FLAG( vps->getIlpSshSignalingEnabledFlag(), "all_ref_layers_active_flag" );
Note: See TracChangeset for help on using the changeset viewer.