Changeset 1251 in SHVCSoftware


Ignore:
Timestamp:
14 Jul 2015, 01:41:52 (9 years ago)
Author:
seregin
Message:

port rev 4245

Location:
branches/SHM-dev/source/Lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1246 r1251  
    20772077  for (Int i = 0; i < maxNumSubLayersMinus1; i++)
    20782078  {
    2079 #if SVC_EXTENSION
    20802079    READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode);
    2081 #else
    2082     if(profilePresentFlag)
    2083     {
    2084       READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode);
    2085     }
    2086 #endif
    20872080    READ_FLAG( uiCode, "sub_layer_level_present_flag[i]"   ); rpcPTL->setSubLayerLevelPresentFlag  (i, uiCode);
    20882081  }
     
    20992092  for(Int i = 0; i < maxNumSubLayersMinus1; i++)
    21002093  {
    2101 #if SVC_EXTENSION
    21022094    if( rpcPTL->getSubLayerProfilePresentFlag(i) )
    2103 #else
    2104     if( profilePresentFlag && rpcPTL->getSubLayerProfilePresentFlag(i) )
    2105 #endif
    21062095    {
    21072096      parseProfileTier(rpcPTL->getSubLayerPTL(i));
  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1250 r1251  
    13351335  for (Int i = 0; i < maxNumSubLayersMinus1; i++)
    13361336  {
    1337 #if SVC_EXTENSION
    13381337    WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
    1339 #else
    1340     if(profilePresentFlag)
    1341     {
    1342       WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
    1343     }
    1344 #endif
    1345 
    13461338    WRITE_FLAG( pcPTL->getSubLayerLevelPresentFlag(i),   "sub_layer_level_present_flag[i]" );
    13471339  }
     
    13571349  for(Int i = 0; i < maxNumSubLayersMinus1; i++)
    13581350  {
    1359 #if SVC_EXTENSION
    13601351    if( pcPTL->getSubLayerProfilePresentFlag(i) )
    1361 #else
    1362     if( profilePresentFlag && pcPTL->getSubLayerProfilePresentFlag(i) )
    1363 #endif
    13641352    {
    13651353      codeProfileTier(pcPTL->getSubLayerPTL(i));  // sub_layer_...
Note: See TracChangeset for help on using the changeset viewer.