Changeset 965 in SHVCSoftware for branches/SHM-upgrade


Ignore:
Timestamp:
6 Jan 2015, 18:33:36 (10 years ago)
Author:
seregin
Message:

update for PTL, provided by Hendry <fhendry@…>

Location:
branches/SHM-upgrade/source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp

    r959 r965  
    6868  MULTIVIEWMAIN = 6,
    6969  SCALABLEMAIN = 7,
    70   SCALABLEMAIN10 = 7,
     70  SCALABLEMAIN10 = 8,
    7171#endif
    7272  // The following are RExt profiles, which would map to the MAINREXT profile idc.
  • TabularUnified branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h

    r962 r965  
    935935    MULTIVIEWMAIN = 6,
    936936    SCALABLEMAIN = 7,
    937     SCALABLEMAIN10 = 7,
     937    SCALABLEMAIN10 = 8,
    938938#endif
    939939  };
  • TabularUnified branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r963 r965  
    23132313    READ_CODE(3,  uiCode, "XXX_reserved_zero_35bits[32..34]");
    23142314  }
     2315#if MULTIPLE_PTL_SUPPORT
     2316  else if (ptl->getProfileIdc() == Profile::SCALABLEMAIN )
     2317  {
     2318    READ_FLAG(    uiCode, "general_max_12bit_constraint_flag" ); assert (uiCode == 1);
     2319    READ_FLAG(    uiCode, "general_max_10bit_constraint_flag" ); assert (uiCode == 1);
     2320    READ_FLAG(    uiCode, "general_max_8bit_constraint_flag"  ); ptl->setProfileIdc  ((uiCode) ? Profile::SCALABLEMAIN : Profile::SCALABLEMAIN10);
     2321    READ_FLAG(    uiCode, "general_max_422chroma_constraint_flag"  ); assert (uiCode == 1);
     2322    READ_FLAG(    uiCode, "general_max_420chroma_constraint_flag"  ); assert (uiCode == 1);
     2323    READ_FLAG(    uiCode, "general_max_monochrome_constraint_flag" ); assert (uiCode == 0);
     2324    READ_FLAG(    uiCode, "general_intra_constraint_flag"); assert (uiCode == 0);
     2325    READ_FLAG(    uiCode, "general_one_picture_only_constraint_flag"); assert (uiCode == 0);
     2326    READ_FLAG(    uiCode, "general_lower_bit_rate_constraint_flag"); assert (uiCode == 1);
     2327    READ_CODE(16, uiCode, "XXX_reserved_zero_35bits[0..15]");
     2328    READ_CODE(16, uiCode, "XXX_reserved_zero_35bits[16..31]");
     2329    READ_CODE(3,  uiCode, "XXX_reserved_zero_35bits[32..34]");
     2330  }
     2331#endif
    23152332  else
    23162333  {
  • TabularUnified branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

    r963 r965  
    14961496  WRITE_CODE( ptl->getProfileSpace(), 2 ,     "XXX_profile_space[]");
    14971497  WRITE_FLAG( ptl->getTierFlag()==Level::HIGH, "XXX_tier_flag[]"    );
     1498#if MULTIPLE_PTL_SUPPORT
     1499  WRITE_CODE( (ptl->getProfileIdc() == Profile::SCALABLEMAIN || ptl->getProfileIdc() == Profile::SCALABLEMAIN10) ? 7 : Int(ptl->getProfileIdc()), 5 ,  "XXX_profile_idc[]"  );
     1500#else
    14981501  WRITE_CODE( Int(ptl->getProfileIdc()), 5 ,  "XXX_profile_idc[]"  );
     1502#endif
    14991503  for(Int j = 0; j < 32; j++)
    15001504  {
     
    15241528    WRITE_CODE(0 ,  3, "XXX_reserved_zero_35bits[32..34]");
    15251529  }
     1530#if MULTIPLE_PTL_SUPPORT
     1531  else if (ptl->getProfileIdc() == Profile::SCALABLEMAIN || ptl->getProfileIdc() == Profile::SCALABLEMAIN10)
     1532  {
     1533    WRITE_FLAG(true, "general_max_12bit_constraint_flag");
     1534    WRITE_FLAG(true, "general_max_10bit_constraint_flag");
     1535    WRITE_FLAG((ptl->getProfileIdc() == Profile::SCALABLEMAIN) ? true : false, "general_max_8bit_constraint_flag");
     1536    WRITE_FLAG(true, "general_max_422chroma_constraint_flag");
     1537    WRITE_FLAG(true, "general_max_420chroma_constraint_flag");
     1538    WRITE_FLAG(false, "general_max_monochrome_constraint_flag");
     1539    WRITE_FLAG(false, "general_intra_constraint_flag");
     1540    WRITE_FLAG(false, "general_one_picture_only_constraint_flag");
     1541    WRITE_FLAG(true, "general_lower_bit_rate_constraint_flag");
     1542    WRITE_CODE(0 , 16, "XXX_reserved_zero_35bits[0..15]");
     1543    WRITE_CODE(0 , 16, "XXX_reserved_zero_35bits[16..31]");
     1544    WRITE_CODE(0 ,  3, "XXX_reserved_zero_35bits[32..34]");
     1545  }
     1546#endif
    15261547  else
    15271548  {
Note: See TracChangeset for help on using the changeset viewer.