Changeset 965 in SHVCSoftware for branches/SHM-upgrade
- Timestamp:
- 6 Jan 2015, 18:33:36 (10 years ago)
- Location:
- branches/SHM-upgrade/source
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp ¶
r959 r965 68 68 MULTIVIEWMAIN = 6, 69 69 SCALABLEMAIN = 7, 70 SCALABLEMAIN10 = 7,70 SCALABLEMAIN10 = 8, 71 71 #endif 72 72 // The following are RExt profiles, which would map to the MAINREXT profile idc. -
TabularUnified branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h ¶
r962 r965 935 935 MULTIVIEWMAIN = 6, 936 936 SCALABLEMAIN = 7, 937 SCALABLEMAIN10 = 7,937 SCALABLEMAIN10 = 8, 938 938 #endif 939 939 }; -
TabularUnified branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶
r963 r965 2313 2313 READ_CODE(3, uiCode, "XXX_reserved_zero_35bits[32..34]"); 2314 2314 } 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 2315 2332 else 2316 2333 { -
TabularUnified branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp ¶
r963 r965 1496 1496 WRITE_CODE( ptl->getProfileSpace(), 2 , "XXX_profile_space[]"); 1497 1497 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 1498 1501 WRITE_CODE( Int(ptl->getProfileIdc()), 5 , "XXX_profile_idc[]" ); 1502 #endif 1499 1503 for(Int j = 0; j < 32; j++) 1500 1504 { … … 1524 1528 WRITE_CODE(0 , 3, "XXX_reserved_zero_35bits[32..34]"); 1525 1529 } 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 1526 1547 else 1527 1548 {
Note: See TracChangeset for help on using the changeset viewer.