Changeset 368 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib
- Timestamp:
- 3 May 2013, 17:16:12 (12 years ago)
- Location:
- branches/HTM-DEV-0.1-dev/source/Lib
- Files:
-
- 24 edited
-
TAppCommon/program_options_lite.h (modified) (3 diffs)
-
TLibCommon/CommonDef.h (modified) (2 diffs)
-
TLibCommon/NAL.h (modified) (2 diffs)
-
TLibCommon/TComPic.cpp (modified) (2 diffs)
-
TLibCommon/TComPic.h (modified) (4 diffs)
-
TLibCommon/TComSlice.cpp (modified) (24 diffs)
-
TLibCommon/TComSlice.h (modified) (15 diffs)
-
TLibCommon/TypeDef.h (modified) (5 diffs)
-
TLibDecoder/NALread.cpp (modified) (1 diff)
-
TLibDecoder/TDecCAVLC.cpp (modified) (7 diffs)
-
TLibDecoder/TDecGop.cpp (modified) (2 diffs)
-
TLibDecoder/TDecTop.cpp (modified) (16 diffs)
-
TLibDecoder/TDecTop.h (modified) (5 diffs)
-
TLibEncoder/NALwrite.cpp (modified) (2 diffs)
-
TLibEncoder/NALwrite.h (modified) (1 diff)
-
TLibEncoder/TEncAnalyze.cpp (modified) (2 diffs)
-
TLibEncoder/TEncAnalyze.h (modified) (1 diff)
-
TLibEncoder/TEncCavlc.cpp (modified) (6 diffs)
-
TLibEncoder/TEncCfg.h (modified) (5 diffs)
-
TLibEncoder/TEncGOP.cpp (modified) (24 diffs)
-
TLibEncoder/TEncGOP.h (modified) (4 diffs)
-
TLibEncoder/TEncSlice.cpp (modified) (9 diffs)
-
TLibEncoder/TEncTop.cpp (modified) (14 diffs)
-
TLibEncoder/TEncTop.h (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h
r367 r368 37 37 #include <map> 38 38 39 #if H_MV 40 #include <vector> 41 #include <errno.h> 42 #include <cstring> 43 44 #ifdef WIN32 45 #define strdup _strdup 46 #endif 47 #endif 39 48 //! \ingroup TAppCommon 40 49 //! \{ … … 136 145 } 137 146 147 #if H_MV 148 template<> 149 inline void 150 Option<char*>::parse(const std::string& arg) 151 { 152 opt_storage = arg.empty() ? NULL : strdup(arg.c_str()) ; 153 } 154 155 template<> 156 inline void 157 Option< std::vector<char*> >::parse(const std::string& arg) 158 { 159 opt_storage.clear(); 160 161 char* pcStart = (char*) arg.data(); 162 char* pcEnd = strtok (pcStart," "); 163 164 while (pcEnd != NULL) 165 { 166 size_t uiStringLength = pcEnd - pcStart; 167 char* pcNewStr = (char*) malloc( uiStringLength + 1 ); 168 strncpy( pcNewStr, pcStart, uiStringLength); 169 pcNewStr[uiStringLength] = '\0'; 170 pcStart = pcEnd+1; 171 pcEnd = strtok (NULL, " ,.-"); 172 opt_storage.push_back( pcNewStr ); 173 } 174 } 175 176 177 template<> 178 inline void 179 Option< std::vector<double> >::parse(const std::string& arg) 180 { 181 char* pcNextStart = (char*) arg.data(); 182 char* pcEnd = pcNextStart + arg.length(); 183 184 char* pcOldStart = 0; 185 186 size_t iIdx = 0; 187 188 while (pcNextStart < pcEnd) 189 { 190 errno = 0; 191 192 if ( iIdx < opt_storage.size() ) 193 { 194 opt_storage[iIdx] = strtod(pcNextStart, &pcNextStart); 195 } 196 else 197 { 198 opt_storage.push_back( strtod(pcNextStart, &pcNextStart)) ; 199 } 200 iIdx++; 201 202 if ( errno == ERANGE || (pcNextStart == pcOldStart) ) 203 { 204 std::cerr << "Error Parsing Doubles: `" << arg << "'" << std::endl; 205 exit(EXIT_FAILURE); 206 }; 207 while( (pcNextStart < pcEnd) && ( *pcNextStart == ' ' || *pcNextStart == '\t' || *pcNextStart == '\r' ) ) pcNextStart++; 208 pcOldStart = pcNextStart; 209 210 } 211 } 212 213 template<> 214 inline void 215 Option< std::vector<int> >::parse(const std::string& arg) 216 { 217 opt_storage.clear(); 218 219 220 char* pcNextStart = (char*) arg.data(); 221 char* pcEnd = pcNextStart + arg.length(); 222 223 char* pcOldStart = 0; 224 225 size_t iIdx = 0; 226 227 228 while (pcNextStart < pcEnd) 229 { 230 231 if ( iIdx < opt_storage.size() ) 232 { 233 opt_storage[iIdx] = (int) strtol(pcNextStart, &pcNextStart,10); 234 } 235 else 236 { 237 opt_storage.push_back( (int) strtol(pcNextStart, &pcNextStart,10)) ; 238 } 239 iIdx++; 240 if ( errno == ERANGE || (pcNextStart == pcOldStart) ) 241 { 242 std::cerr << "Error Parsing Integers: `" << arg << "'" << std::endl; 243 exit(EXIT_FAILURE); 244 }; 245 while( (pcNextStart < pcEnd) && ( *pcNextStart == ' ' || *pcNextStart == '\t' || *pcNextStart == '\r' ) ) pcNextStart++; 246 pcOldStart = pcNextStart; 247 } 248 } 249 250 251 template<> 252 inline void 253 Option< std::vector<bool> >::parse(const std::string& arg) 254 { 255 char* pcNextStart = (char*) arg.data(); 256 char* pcEnd = pcNextStart + arg.length(); 257 258 char* pcOldStart = 0; 259 260 size_t iIdx = 0; 261 262 while (pcNextStart < pcEnd) 263 { 264 if ( iIdx < opt_storage.size() ) 265 { 266 opt_storage[iIdx] = (strtol(pcNextStart, &pcNextStart,10) != 0); 267 } 268 else 269 { 270 opt_storage.push_back(strtol(pcNextStart, &pcNextStart,10) != 0) ; 271 } 272 iIdx++; 273 274 if ( errno == ERANGE || (pcNextStart == pcOldStart) ) 275 { 276 std::cerr << "Error Parsing Bools: `" << arg << "'" << std::endl; 277 exit(EXIT_FAILURE); 278 }; 279 while( (pcNextStart < pcEnd) && ( *pcNextStart == ' ' || *pcNextStart == '\t' || *pcNextStart == '\r' ) ) pcNextStart++; 280 pcOldStart = pcNextStart; 281 } 282 } 283 #endif 138 284 /** Option class for argument handling using a user provided function */ 139 285 struct OptionFunc : public OptionBase … … 210 356 } 211 357 358 #if H_MV 359 template<typename T> 360 OptionSpecific& 361 operator()(const std::string& name, std::vector<T>& storage, T default_val, unsigned uiMaxNum, const std::string& desc = "" ) 362 { 363 std::string cNameBuffer; 364 std::string cDescriptionBuffer; 365 366 cNameBuffer .resize( name.size() + 10 ); 367 cDescriptionBuffer.resize( desc.size() + 10 ); 368 369 storage.resize(uiMaxNum); 370 for ( unsigned int uiK = 0; uiK < uiMaxNum; uiK++ ) 371 { 372 // isn't there are sprintf function for string?? 373 sprintf((char*) cNameBuffer.c_str() ,name.c_str(),uiK,uiK); 374 sprintf((char*) cDescriptionBuffer.c_str(),desc.c_str(),uiK,uiK); 375 376 parent.addOption(new Option<T>( cNameBuffer, (storage[uiK]), default_val, cDescriptionBuffer )); 377 } 378 379 return *this; 380 } 381 #endif 212 382 /** 213 383 * Add option described by name to the parent Options list, -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h
r367 r368 56 56 // ==================================================================================================================== 57 57 58 #if H_MV 59 #define NV_VERSION "0.1" ///< Current software version 60 #define HM_VERSION "10.1" ///< 61 #else 58 62 #define NV_VERSION "10.1" ///< Current software version 63 #endif 59 64 60 65 // ==================================================================================================================== … … 152 157 } 153 158 159 #if H_MV 160 161 #define AOF( exp ) \ 162 { \ 163 if( !( exp ) ) \ 164 { \ 165 assert( 0 ); \ 166 } \ 167 } 168 169 #endif 154 170 155 171 // ==================================================================================================================== -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h
r367 r368 47 47 NalUnitType m_nalUnitType; ///< nal_unit_type 48 48 UInt m_temporalId; ///< temporal_id 49 #if H_MV 50 Int m_layerId; ///< layer id 51 #else 49 52 UInt m_reservedZero6Bits; ///< reserved_zero_6bits 53 #endif 50 54 51 55 /** construct an NALunit structure with given header values. */ … … 53 57 NalUnitType nalUnitType, 54 58 Int temporalId = 0, 59 #if H_MV 60 Int layerId = 0) 61 #else 55 62 Int reservedZero6Bits = 0) 63 #endif 56 64 :m_nalUnitType (nalUnitType) 57 65 ,m_temporalId (temporalId) 66 #if H_MV 67 ,m_layerId (layerId) 68 #else 58 69 ,m_reservedZero6Bits(reservedZero6Bits) 70 #endif 59 71 {} 60 72 -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.cpp
r367 r368 64 64 , m_pNDBFilterYuvTmp (NULL) 65 65 , m_bCheckLTMSB (false) 66 #if H_MV 67 , m_layerId (0) 68 , m_viewId (0) 69 #if H_3D 70 , m_isDepth (false) 71 #endif 72 #endif 66 73 { 67 74 m_apcPicYuv[0] = NULL; … … 464 471 465 472 } 473 #if H_MV 474 Void TComPic::print( Bool legend ) 475 { 476 if ( legend ) 477 std::cout << "LId" << "\t" << "POC" << "\t" << "Rec" << "\t" << "Ref" << "\t" << "LT" << std::endl; 478 else 479 std::cout << getLayerId() << "\t" << getPOC()<< "\t" << getReconMark() << "\t" << getSlice(0)->isReferenced() << "\t" << getIsLongTerm() << std::endl; 480 } 481 #endif 466 482 467 483 -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h
r367 r368 86 86 SEIMessages m_SEIs; ///< Any SEI messages that have been received. If !NULL we own the object. 87 87 88 #if H_MV 89 Int m_layerId; 90 Int m_viewId; 91 #if H_3D 92 Bool m_isDepth; 93 #endif 94 #endif 88 95 public: 89 96 TComPic(); … … 98 105 Void setTLayer( UInt uiTLayer ) { m_uiTLayer = uiTLayer; } 99 106 107 #if H_MV 108 Void setLayerId ( Int layerId ) { m_layerId = layerId; } 109 Int getLayerId () { return m_layerId; } 110 Void setViewId ( Int viewId ) { m_viewId = viewId; } 111 Int getViewId () { return m_viewId; } 112 #if H_3D 113 Void setIsDepth ( Bool isDepth ) { m_isDepth = isDepth; } 114 Bool getIsDepth () { return m_isDepth; } 115 #endif 116 #endif 100 117 Bool getUsedByCurr() { return m_bUsedByCurr; } 101 118 Void setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; } … … 164 181 std::vector<TComDataCU*>& getOneSliceCUDataForNDBFilter (Int sliceID) { return m_vSliceCUDataLink[sliceID];} 165 182 183 #if H_MV 184 Void print( Bool legend ); 185 #endif 166 186 /** transfer ownership of seis to this picture */ 167 187 void setSEIs(SEIMessages& seis) { m_SEIs = seis; } … … 179 199 };// END CLASS DEFINITION TComPic 180 200 201 #if H_MV 202 class TComPicLists 203 { 204 private: 205 TComList<TComList<TComPic*>*> m_lists; 206 public: 207 208 Void push_back( TComList<TComPic*>* list ) { m_lists.push_back( list ); } 209 Int size () { return (Int) m_lists.size (); } 210 211 TComPic* getPic( Int layerIdInNuh, Int poc ) 212 { 213 TComPic* pcPic = NULL; 214 for(TComList<TComList<TComPic*>*>::iterator itL = m_lists.begin(); ( itL != m_lists.end() && pcPic == NULL ); itL++) 215 { 216 for(TComList<TComPic*>::iterator itP=(*itL)->begin(); ( itP!=(*itL)->end() && pcPic == NULL ); itP++) 217 { 218 if ( ( (*itP)->getPOC() == poc ) && ( (*itP)->getLayerId() == layerIdInNuh ) ) 219 { 220 pcPic = *itP ; 221 } 222 } 223 } 224 return pcPic; 225 } 226 227 Void print( ) 228 { 229 Bool first = true; 230 for(TComList<TComList<TComPic*>*>::iterator itL = m_lists.begin(); ( itL != m_lists.end() ); itL++) 231 { 232 for(TComList<TComPic*>::iterator itP=(*itL)->begin(); ( itP!=(*itL)->end() ); itP++) 233 { 234 if ( first ) 235 { 236 (*itP)->print( true ); 237 first = false; 238 } 239 (*itP)->print( false ); 240 } 241 } 242 } 243 244 245 }; // END CLASS DEFINITION TComPicLists 246 247 #endif 181 248 //! \} 182 249 -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp
r367 r368 107 107 , m_temporalLayerNonReferenceFlag ( false ) 108 108 , m_enableTMVPFlag ( true ) 109 #if H_MV 110 , m_layerId (0) 111 , m_viewId (0) 112 #if H_3D 113 , m_isDepth (false) 114 #endif 115 #endif 109 116 { 110 117 #if L0034_COMBINED_LIST_CLEANUP … … 138 145 m_aiRefPOCList [0][iNumCount] = 0; 139 146 m_aiRefPOCList [1][iNumCount] = 0; 147 #if H_MV 148 m_aiRefLayerIdList[0][iNumCount] = 0; 149 m_aiRefLayerIdList[1][iNumCount] = 0; 150 #endif 140 151 } 141 152 resetWpScaling(); … … 309 320 { 310 321 m_aiRefPOCList[iDir][iNumRefIdx] = m_apcRefPicList[iDir][iNumRefIdx]->getPOC(); 322 #if H_MV 323 m_aiRefLayerIdList[iDir][iNumRefIdx] = m_apcRefPicList[iDir][iNumRefIdx]->getLayerId(); 324 #endif 311 325 } 312 326 } … … 354 368 for ( Int iRefIdxLC = 0; iRefIdxLC < m_aiNumRefIdx[REF_PIC_LIST_C]; iRefIdxLC++ ) 355 369 { 370 #if H_MV 371 if ( m_apcRefPicList[REF_PIC_LIST_0][iNumRefIdx]->getPOC() == m_apcRefPicList[m_eListIdFromIdxOfLC[iRefIdxLC]][m_iRefIdxFromIdxOfLC[iRefIdxLC]]->getPOC() && 372 m_apcRefPicList[REF_PIC_LIST_0][iNumRefIdx]->getLayerId() == m_apcRefPicList[m_eListIdFromIdxOfLC[iRefIdxLC]][m_iRefIdxFromIdxOfLC[iRefIdxLC]]->getLayerId() ) 373 #else 356 374 if ( m_apcRefPicList[REF_PIC_LIST_0][iNumRefIdx]->getPOC() == m_apcRefPicList[m_eListIdFromIdxOfLC[iRefIdxLC]][m_iRefIdxFromIdxOfLC[iRefIdxLC]]->getPOC() ) 375 #endif 357 376 { 358 377 m_iRefIdxOfL1FromRefIdxOfL0[iNumRefIdx] = m_iRefIdxFromIdxOfLC[iRefIdxLC]; … … 376 395 for ( Int iRefIdxLC = 0; iRefIdxLC < m_aiNumRefIdx[REF_PIC_LIST_C]; iRefIdxLC++ ) 377 396 { 397 #if H_MV 398 if ( m_apcRefPicList[REF_PIC_LIST_1][iNumRefIdx]->getPOC() == m_apcRefPicList[m_eListIdFromIdxOfLC[iRefIdxLC]][m_iRefIdxFromIdxOfLC[iRefIdxLC]]->getPOC() && 399 m_apcRefPicList[REF_PIC_LIST_1][iNumRefIdx]->getLayerId() == m_apcRefPicList[m_eListIdFromIdxOfLC[iRefIdxLC]][m_iRefIdxFromIdxOfLC[iRefIdxLC]]->getLayerId() ) 400 #else 378 401 if ( m_apcRefPicList[REF_PIC_LIST_1][iNumRefIdx]->getPOC() == m_apcRefPicList[m_eListIdFromIdxOfLC[iRefIdxLC]][m_iRefIdxFromIdxOfLC[iRefIdxLC]]->getPOC() ) 402 #endif 379 403 { 380 404 m_iRefIdxOfL0FromRefIdxOfL1[iNumRefIdx] = m_iRefIdxFromIdxOfLC[iRefIdxLC]; … … 396 420 #endif 397 421 422 #if H_MV 423 Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& refPicSetInterLayer , Bool checkNumPocTotalCurr) 424 #else 398 425 #if FIX1071 399 426 Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr ) … … 401 428 Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic ) 402 429 #endif 430 #endif 403 431 { 404 432 #if FIX1071 … … 414 442 } 415 443 444 #if !H_MV 416 445 m_aiNumRefIdx[0] = getNumRefIdx(REF_PIC_LIST_0); 417 446 m_aiNumRefIdx[1] = getNumRefIdx(REF_PIC_LIST_1); 447 #endif 418 448 } 419 449 … … 425 455 UInt NumPocStCurr1 = 0; 426 456 UInt NumPocLtCurr = 0; 457 #if H_MV 458 Int numDirectRefLayers = getVPS()->getNumDirectRefLayers( getLayerIdInVps() ); 459 assert( numDirectRefLayers == refPicSetInterLayer.size() ); 460 #endif 427 461 Int i; 428 462 … … 473 507 TComPic* rpsCurrList0[MAX_NUM_REF+1]; 474 508 TComPic* rpsCurrList1[MAX_NUM_REF+1]; 509 #if H_MV 510 Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + numDirectRefLayers; 511 assert( numPocTotalCurr == getNumRpsCurrTempList() ); 512 #else 475 513 Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr; 514 #endif 476 515 #if FIX1071 477 516 if (checkNumPocTotalCurr) … … 513 552 rpsCurrList0[cIdx] = RefPicSetLtCurr[i]; 514 553 } 554 #if H_MV 555 for ( i=0; i<numDirectRefLayers; i++, cIdx++) 556 { 557 if( cIdx <= MAX_NUM_REF ) 558 { 559 rpsCurrList0[cIdx] = refPicSetInterLayer[i]; 560 } 561 } 562 #endif 515 563 516 564 if (m_eSliceType==B_SLICE) … … 529 577 rpsCurrList1[cIdx] = RefPicSetLtCurr[i]; 530 578 } 579 #if H_MV 580 for ( i=0; i<numDirectRefLayers; i++, cIdx++) 581 { 582 if( cIdx <= MAX_NUM_REF ) 583 { 584 rpsCurrList1[cIdx] = refPicSetInterLayer[i]; 585 } 586 } 587 #endif 531 588 } 532 589 … … 570 627 } 571 628 } 629 #if H_MV 630 numRpsCurrTempList = numRpsCurrTempList + getVPS()->getNumDirectRefLayers( getLayerIdInVps() ); 631 #endif 572 632 return numRpsCurrTempList; 573 633 } … … 732 792 m_iPOC = pSrc->m_iPOC; 733 793 m_eNalUnitType = pSrc->m_eNalUnitType; 794 #if H_MV 795 m_layerId = pSrc->m_layerId; 796 #endif 734 797 m_eSliceType = pSrc->m_eSliceType; 735 798 m_iSliceQp = pSrc->m_iSliceQp; … … 784 847 m_apcRefPicList[i][j] = pSrc->m_apcRefPicList[i][j]; 785 848 m_aiRefPOCList[i][j] = pSrc->m_aiRefPOCList[i][j]; 849 #if H_MV 850 m_aiRefLayerIdList[i][j] = pSrc->m_aiRefLayerIdList[i][j]; 851 #endif 786 852 } 787 853 } … … 799 865 800 866 // access channel 867 #if H_MV 868 m_pcVPS = pSrc->m_pcVPS; 869 #endif 801 870 m_pcSPS = pSrc->m_pcSPS; 802 871 m_pcPPS = pSrc->m_pcPPS; … … 1312 1381 , m_bTemporalIdNestingFlag (false) 1313 1382 , m_numHrdParameters ( 0) 1383 #if H_MV 1384 , m_maxNuhLayerId ( 0) 1385 #else 1314 1386 , m_maxNuhReservedZeroLayerId ( 0) 1387 #endif 1315 1388 , m_hrdParameters (NULL) 1316 1389 , m_hrdOpSetIdx (NULL) … … 1327 1400 m_uiMaxLatencyIncrease[i] = 0; 1328 1401 } 1402 #if H_MV 1403 m_avcBaseLayerFlag = false; 1404 m_splittingFlag = false; 1405 1406 for( Int i = 0; i < MAX_NUM_SCALABILITY_TYPES; i++ ) 1407 { 1408 m_scalabilityMask[i] = false; 1409 m_dimensionIdLen [i] = -1; 1410 } 1411 1412 m_vpsNuhLayerIdPresentFlag = false; 1413 m_numOutputLayerSets = 0; 1414 1415 for( Int i = 0; i < MAX_VPS_OP_SETS_PLUS1; i++ ) 1416 { 1417 m_vpsProfilePresentFlag [i] = false; 1418 m_profileLayerSetRefMinus1[i] = 0; 1419 m_outputLayerSetIdx [i] = 0; 1420 for( Int j = 0; j < MAX_VPS_NUH_LAYER_ID_PLUS1; j++ ) 1421 { 1422 m_outputLayerFlag[i][j] = false; 1423 } 1424 } 1425 1426 for( Int i = 0; i < MAX_NUM_LAYER_IDS; i++ ) 1427 { 1428 m_layerIdInVps[i] = (i == 0 ) ? 0 : -1; 1429 } 1430 1431 for( Int i = 0; i < MAX_NUM_LAYERS; i++ ) 1432 { 1433 m_layerIdInNuh [i] = ( i == 0 ) ? 0 : -1; 1434 m_numDirectRefLayers[i] = 0; 1435 1436 for( Int j = 0; j < MAX_NUM_LAYERS; j++ ) 1437 { 1438 m_directDependencyFlag[i][j] = false; 1439 m_refLayerId[i][j] = -1; 1440 } 1441 1442 for( Int j = 0; j < MAX_NUM_SCALABILITY_TYPES; j++ ) 1443 { 1444 m_dimensionId[i][j] = 0; 1445 } 1446 1447 } 1448 #endif 1329 1449 } 1330 1450 … … 1336 1456 } 1337 1457 1458 #if H_MV 1459 1460 Bool TComVPS::checkVPSExtensionSyntax() 1461 { 1462 // check splitting flag constraint 1463 if ( getSplittingFlag() ) 1464 { 1465 // Derive dimBitOffset[j] 1466 Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; 1467 Int numScalabilityTypes = getNumScalabilityTypes(); 1468 dimBitOffset[0] = 0; 1469 1470 for (Int type = 1; type <= numScalabilityTypes; type++ ) 1471 { 1472 dimBitOffset[ type ] = 0; 1473 for (Int dimIdx = 0; dimIdx <= type - 1; dimIdx++) 1474 dimBitOffset[ type ] += ( getDimensionIdLen( dimIdx ) ); 1475 } 1476 1477 for (Int type = 0; type < getNumScalabilityTypes(); type++ ) 1478 { 1479 for( Int layer = 1; layer < getMaxLayers(); layer++ ) 1480 { 1481 assert( getDimensionId( layer, type ) == ( ( getLayerIdInNuh( layer ) & ( (1 << dimBitOffset[ type + 1 ] ) - 1) ) >> dimBitOffset[ type ] ) ); 1482 }; 1483 }; 1484 } 1485 1486 for( Int layer = 1; layer < getMaxLayers(); layer++ ) 1487 { 1488 // check layer_id_in_nuh constraint 1489 assert( getLayerIdInNuh( layer ) > getLayerIdInNuh( layer -1 ) ); 1490 } 1491 return true; 1492 } 1493 1494 Int TComVPS::getNumScalabilityTypes() 1495 { 1496 return scalTypeToScalIdx( ScalabilityType(MAX_NUM_SCALABILITY_TYPES) ); 1497 } 1498 1499 Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) 1500 { 1501 assert( scalType >= 0 && scalType <= MAX_NUM_SCALABILITY_TYPES ); 1502 assert( scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) ); 1503 1504 Int scalIdx = 0; 1505 for( Int curScalType = 0; curScalType < scalType; curScalType++ ) 1506 { 1507 scalIdx += ( getScalabilityMask( curScalType ) ? 1 : 0 ); 1508 } 1509 1510 return scalIdx; 1511 } 1512 1513 1514 1515 Void TComVPS::setScalabilityMask( UInt val ) 1516 { 1517 for ( Int scalType = 0; scalType < MAX_NUM_SCALABILITY_TYPES; scalType++ ) 1518 setScalabilityMask( scalType, ( val & (1 << scalType ) ) == 1 ); 1519 } 1520 1521 Void TComVPS::calcIvRefLayers() 1522 { 1523 for( Int i = 1; i <= getMaxLayers(); i++ ) 1524 { 1525 m_numDirectRefLayers[ i ] = 0; 1526 for( Int j = 0 ; j < i; j++ ) 1527 if( m_directDependencyFlag[ i ][ j ]) 1528 m_refLayerId[ i ][ m_numDirectRefLayers[ i ]++ ] = m_layerIdInNuh[ j ]; 1529 } 1530 } 1531 1532 Int TComVPS::getRefLayerId( Int layerIdInVps, Int idx ) 1533 { 1534 assert( idx >= 0 && idx < m_numDirectRefLayers[layerIdInVps] ); 1535 Int layerIdInNuh = m_refLayerId[ layerIdInVps ][ idx ]; 1536 assert ( layerIdInNuh >= 0 ); 1537 return layerIdInNuh; 1538 } 1539 1540 Int TComVPS::getScalabilityId( Int layerIdInVps, ScalabilityType scalType ) 1541 { 1542 return ( ( layerIdInVps != 0 )&& getScalabilityMask( scalType ) ) ? getDimensionId( layerIdInVps, scalTypeToScalIdx( scalType ) ) : 0; 1543 } 1544 #endif 1338 1545 // ------------------------------------------------------------------------------------------------ 1339 1546 // Sequence parameter set (SPS) … … 1382 1589 , m_vuiParametersPresentFlag (false) 1383 1590 , m_vuiParameters () 1591 #if H_MV 1592 , m_interViewMvVertConstraintFlag (false) 1593 #endif 1384 1594 { 1385 1595 for ( Int i = 0; i < MAX_TLAYER; i++ ) … … 1845 2055 } 1846 2056 2057 #if H_MV 2058 Void TComSlice::createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector<TComPic*>& refPicSetInterLayer ) 2059 { 2060 refPicSetInterLayer.clear(); 2061 2062 for( Int i = 0; i < getVPS()->getNumDirectRefLayers( getLayerIdInVps() ); i++ ) 2063 { 2064 Int layerIdRef = getVPS()->getRefLayerId( getLayerIdInVps(), i ); 2065 TComPic* picRef = ivPicLists->getPic( layerIdRef, getPOC() ) ; 2066 assert ( picRef != 0 ); 2067 2068 picRef->getPicYuvRec()->extendPicBorder(); 2069 picRef->setIsLongTerm( true ); 2070 picRef->getSlice(0)->setReferenced( true ); 2071 2072 refPicSetInterLayer.push_back( picRef ); 2073 } 2074 } 2075 2076 Void TComSlice::markIvRefPicsAsShortTerm( std::vector<TComPic*> refPicSetInterLayer ) 2077 { 2078 // Mark as shortterm 2079 for ( Int i = 0; i < refPicSetInterLayer.size(); i++ ) 2080 { 2081 refPicSetInterLayer[i]->setIsLongTerm( false ); 2082 } 2083 } 2084 2085 Void TComSlice::markIvRefPicsAsUnused( TComPicLists* ivPicLists, std::vector<Int> targetDecLayerIdSet, TComVPS* vps, Int curLayerId, Int curPoc ) 2086 { 2087 // Fill targetDecLayerIdSet with all layers if empty. 2088 if (targetDecLayerIdSet.size() == 0 ) 2089 { 2090 for ( Int layerIdInVps = 0; layerIdInVps < vps->getMaxLayers(); layerIdInVps++ ) 2091 { 2092 targetDecLayerIdSet.push_back( vps->getLayerIdInNuh( layerIdInVps ) ); 2093 } 2094 } 2095 2096 Int numTargetDecLayers = (Int) targetDecLayerIdSet.size(); 2097 Int latestDecIdx; 2098 for ( latestDecIdx = 0; latestDecIdx < numTargetDecLayers; latestDecIdx++) 2099 { 2100 if ( targetDecLayerIdSet[ latestDecIdx ] == curLayerId ) 2101 break; 2102 } 2103 2104 for( Int i = 0; i <= latestDecIdx; i++ ) 2105 { 2106 if ( vps->nuhLayerIdIncluded( targetDecLayerIdSet[ i ] ) ) 2107 { 2108 TComPic* pcPic = ivPicLists->getPic( targetDecLayerIdSet[ i ], curPoc ); 2109 if( pcPic->getSlice(0)->isReferenced() && pcPic->getSlice(0)->getTemporalLayerNonReferenceFlag() ) 2110 { 2111 Bool remainingInterLayerReferencesFlag = false; 2112 for( Int j = latestDecIdx + 1; j < numTargetDecLayers; j++ ) 2113 { 2114 TComVPS* vpsSlice = pcPic->getSlice(0)->getVPS(); 2115 if ( vps->nuhLayerIdIncluded( targetDecLayerIdSet[ j ] ) ) 2116 { 2117 Int targetDecLayerIdinVPS = vpsSlice->getLayerIdInVps( targetDecLayerIdSet[ j ] ); 2118 for( Int k = 0; k < vpsSlice->getNumDirectRefLayers( targetDecLayerIdinVPS ); k++ ) 2119 if ( targetDecLayerIdSet[ i ] == vpsSlice->getRefLayerId( targetDecLayerIdinVPS, k ) ) 2120 remainingInterLayerReferencesFlag = true; 2121 } 2122 } 2123 if( !remainingInterLayerReferencesFlag ) 2124 pcPic->getSlice(0)->setReferenced( false ); 2125 } 2126 } 2127 } 2128 } 2129 2130 Void TComSlice::xPrintRefPicList() 2131 { 2132 for ( Int li = 0; li < 2; li++) 2133 { 2134 std::cout << std::endl << "RefPicListL" << li << ":" << std::endl; 2135 for (Int rIdx = 0; rIdx <= (m_aiNumRefIdx[li]-1); rIdx ++) 2136 { 2137 if (rIdx == 0 && li == 0) m_apcRefPicList[li][rIdx]->print( true ); 2138 2139 m_apcRefPicList[li][rIdx]->print( false ); 2140 } 2141 } 2142 } 2143 #endif 1847 2144 /** get scaling matrix from RefMatrixID 1848 2145 * \param sizeId size index … … 2067 2364 { 2068 2365 Int spsId = pps->getSPSId(); 2366 #if H_MV 2367 // active parameter sets per layer should be used here 2368 #else 2069 2369 if (!isIRAP && (spsId != m_activeSPSId)) 2070 2370 { … … 2072 2372 return false; 2073 2373 } 2374 #endif 2074 2375 TComSPS *sps = m_spsMap.getPS(spsId); 2075 2376 if (sps) … … 2126 2427 } 2127 2428 2429 #if H_MV 2430 Void TComPTL::copyLevelFrom( TComPTL* source ) 2431 { 2432 getGeneralPTL()->setLevelIdc( source->getGeneralPTL()->getLevelIdc() ); 2433 for( Int subLayer = 0; subLayer < 6; subLayer++ ) 2434 { 2435 setSubLayerLevelPresentFlag( subLayer, source->getSubLayerLevelPresentFlag( subLayer ) ); 2436 getSubLayerPTL( subLayer )->setLevelIdc( source->getSubLayerPTL( subLayer )->getLevelIdc() ); 2437 } 2438 } 2439 #endif 2128 2440 #if SIGNAL_BITRATE_PICRATE_IN_VPS 2129 2441 TComBitRatePicRateInfo::TComBitRatePicRateInfo() -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h
r367 r368 51 51 class TComPic; 52 52 class TComTrQuant; 53 #if H_MV 54 class TComPicLists; 55 #endif 53 56 // ==================================================================================================================== 54 57 // Constants … … 245 248 ProfileTierLevel* getGeneralPTL() { return &m_generalPTL; } 246 249 ProfileTierLevel* getSubLayerPTL(Int i) { return &m_subLayerPTL[i]; } 250 #if H_MV 251 Void copyLevelFrom( TComPTL* source ); 252 #endif 247 253 }; 248 254 /// VPS class … … 480 486 481 487 UInt m_numHrdParameters; 488 #if H_MV 489 UInt m_maxNuhLayerId; 490 #else 482 491 UInt m_maxNuhReservedZeroLayerId; 492 #endif 483 493 TComHRD* m_hrdParameters; 484 494 UInt* m_hrdOpSetIdx; 485 495 Bool* m_cprmsPresentFlag; 486 496 UInt m_numOpSets; 497 #if H_MV 498 Bool m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_LAYER_ID_PLUS1]; 499 #else 487 500 Bool m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1]; 488 501 #endif 502 503 #if H_MV 504 TComPTL m_pcPTL[MAX_VPS_OP_SETS_PLUS1]; 505 #else 489 506 TComPTL m_pcPTL; 507 #endif 490 508 #if SIGNAL_BITRATE_PICRATE_IN_VPS 491 509 TComBitRatePicRateInfo m_bitRatePicRateInfo; … … 495 513 #endif 496 514 515 #if H_MV 516 Bool m_avcBaseLayerFlag; 517 Bool m_splittingFlag; 518 Bool m_scalabilityMask [MAX_NUM_SCALABILITY_TYPES]; 519 Int m_dimensionIdLen [MAX_NUM_SCALABILITY_TYPES]; 520 Bool m_vpsNuhLayerIdPresentFlag; 521 Int m_layerIdInNuh [MAX_NUM_LAYER_IDS]; 522 Int m_layerIdInVps [MAX_NUM_LAYERS ]; 523 Int m_dimensionId [MAX_NUM_LAYER_IDS][MAX_NUM_SCALABILITY_TYPES]; 524 525 526 Bool m_vpsProfilePresentFlag [MAX_VPS_OP_SETS_PLUS1]; 527 Int m_profileLayerSetRefMinus1 [MAX_VPS_OP_SETS_PLUS1]; 528 Int m_numOutputLayerSets; 529 Int m_outputLayerSetIdx [MAX_VPS_OP_SETS_PLUS1]; 530 Bool m_outputLayerFlag [MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_LAYER_ID_PLUS1]; 531 Bool m_directDependencyFlag [MAX_NUM_LAYER_IDS][MAX_NUM_LAYER_IDS]; 532 533 Int m_numDirectRefLayers [ MAX_NUM_LAYERS ]; 534 Int m_refLayerId [ MAX_NUM_LAYERS ][MAX_NUM_LAYERS]; 535 536 #endif 497 537 public: 498 538 TComVPS(); … … 536 576 Void setNumHrdParameters(UInt v) { m_numHrdParameters = v; } 537 577 578 #if H_MV 579 UInt getMaxNuhLayerId() { return m_maxNuhLayerId; } 580 Void setMaxNuhLayerId(UInt v) { m_maxNuhLayerId = v; } 581 #else 538 582 UInt getMaxNuhReservedZeroLayerId() { return m_maxNuhReservedZeroLayerId; } 539 583 Void setMaxNuhReservedZeroLayerId(UInt v) { m_maxNuhReservedZeroLayerId = v; } 584 #endif 540 585 541 586 UInt getMaxOpSets() { return m_numOpSets; } … … 544 589 Void setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id) { m_layerIdIncludedFlag[opsIdx][id] = v; } 545 590 591 #if H_MV 592 TComPTL* getPTL( Int layerSet = 0 ) { return &m_pcPTL[layerSet]; } 593 #else 546 594 TComPTL* getPTL() { return &m_pcPTL; } 595 #endif 547 596 #if SIGNAL_BITRATE_PICRATE_IN_VPS 548 597 TComBitRatePicRateInfo *getBitratePicrateInfo() { return &m_bitRatePicRateInfo; } … … 550 599 #if L0043_TIMING_INFO 551 600 TimingInfo* getTimingInfo() { return &m_timingInfo; } 601 #endif 602 #if H_MV 603 Void setAvcBaseLayerFlag( Bool val ) { m_avcBaseLayerFlag = val; } 604 Bool getAvcBaseLayerFlag() { return m_avcBaseLayerFlag; } 605 606 Void setSplittingFlag( Bool val ) { m_splittingFlag = val; } 607 Bool getSplittingFlag() { return m_splittingFlag; } 608 609 Void setScalabilityMask( UInt val ); 610 611 Void setScalabilityMask( Int scalType, Bool val ) { m_scalabilityMask[scalType] = val; } 612 Bool getScalabilityMask( Int scalType ) { return m_scalabilityMask[scalType]; } 613 614 Int getNumScalabilityTypes( ); 615 616 Void setDimensionIdLen( Int sIdx, Int val ) { m_dimensionIdLen[sIdx] = val; } 617 Int getDimensionIdLen( Int sIdx ) { assert( m_dimensionIdLen[sIdx] > 0) ; return m_dimensionIdLen[sIdx]; } 618 619 Void setVpsNuhLayerIdPresentFlag( Bool val ) { m_vpsNuhLayerIdPresentFlag = val; } 620 Bool getVpsNuhLayerIdPresentFlag() { return m_vpsNuhLayerIdPresentFlag; } 621 622 Void setLayerIdInNuh( Int layerIdInVps, Int val ) { m_layerIdInNuh[layerIdInVps] = val; } 623 Int getLayerIdInNuh( Int layerIdInVps ) { assert( m_layerIdInNuh[layerIdInVps] >= 0 ); return m_layerIdInNuh[layerIdInVps]; } 624 625 Void setLayerIdInVps( Int layerIdInNuh, Int val ) { m_layerIdInVps[layerIdInNuh] = val; } 626 Int getLayerIdInVps( Int layerIdInNuh ) { assert( m_layerIdInVps[layerIdInNuh] >= 0 ); return m_layerIdInVps[layerIdInNuh]; } 627 628 Bool nuhLayerIdIncluded( Int layerIdinNuh ) { return ( m_layerIdInVps[ layerIdinNuh ] > 0 ); } 629 630 Void setDimensionId( Int layerIdInVps, Int scalIdx, Int val ) { m_dimensionId[layerIdInVps][scalIdx] = val; } 631 Int getDimensionId( Int layerIdInVps, Int scalIdx ) { return m_dimensionId[layerIdInVps][scalIdx]; } 632 633 Int getScalabilityId ( Int layerIdInVps, ScalabilityType scalType ); 634 635 Int getViewId ( Int layerIdInVps ) { return getScalabilityId( layerIdInVps, VIEW_ID ); } 636 #if H_3D 637 Int getDepthId ( Int layerIdInVps ) { return getScalabilityId( layerIdInVps, DEPTH_ID ); } 638 #endif 639 640 641 Void setVpsProfilePresentFlag( Int layerSet, Bool val ) { m_vpsProfilePresentFlag[layerSet] = val; } 642 Bool getVpsProfilePresentFlag( Int layerSet ) { return m_vpsProfilePresentFlag[layerSet]; } 643 644 Void setProfileLayerSetRefMinus1( Int layerSet, Int val ) { m_profileLayerSetRefMinus1[layerSet] = val; } 645 Bool getProfileLayerSetRefMinus1( Int layerSet ) { return m_profileLayerSetRefMinus1[layerSet]; } 646 647 Void setNumOutputLayerSets( Int val ) { m_numOutputLayerSets = val; } 648 Int getNumOutputLayerSets() { return m_numOutputLayerSets; } 649 650 Void setOutputLayerSetIdx( Int layerSet, Int val ) { m_outputLayerSetIdx[layerSet] = val; } 651 Int getOutputLayerSetIdx( Int layerSet ) { return m_outputLayerSetIdx[layerSet]; } 652 653 Void setOutputLayerFlag( Int layerSet, Int layer, Bool val ) { m_outputLayerFlag[layerSet][layer] = val; } 654 Bool getOutputLayerFlag( Int layerSet, Int layer ) { return m_outputLayerFlag[layerSet][layer]; } 655 656 Void setDirectDependencyFlag( Int layerHigh, Int layerLow, Bool val ) { m_directDependencyFlag[layerHigh][layerLow] = val; } 657 Bool getDirectDependencyFlag( Int layerHigh, Int layerLow ) { return m_directDependencyFlag[layerHigh][layerLow]; } 658 659 Void calcIvRefLayers(); 660 661 Int getNumDirectRefLayers( Int layerIdInVps ) { return m_numDirectRefLayers[ layerIdInVps ]; }; 662 Int getRefLayerId ( Int layerIdInVps, Int idx );; 663 664 Bool checkVPSExtensionSyntax(); 665 Int scalTypeToScalIdx ( ScalabilityType scalType ); 552 666 #endif 553 667 }; … … 853 967 static const Int m_winUnitY[MAX_CHROMA_FORMAT_IDC+1]; 854 968 TComPTL m_pcPTL; 969 #if H_MV 970 Bool m_interViewMvVertConstraintFlag; 971 #endif 855 972 public: 856 973 TComSPS(); … … 983 1100 984 1101 TComPTL* getPTL() { return &m_pcPTL; } 1102 #if H_MV 1103 Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; } 1104 Bool getInterViewMvVertConstraintFlag() { return m_interViewMvVertConstraintFlag;} 1105 #endif 985 1106 }; 986 1107 … … 1009 1130 Void setRefPicSetIdxL1(UInt idx, UInt refPicSetIdx) { m_RefPicSetIdxL1[idx] = refPicSetIdx; } 1010 1131 UInt getRefPicSetIdxL1(UInt idx) { return m_RefPicSetIdxL1[idx]; } 1132 #if H_MV 1133 // Why not an listIdx for all members, would avoid code duplication?? 1134 Void setRefPicSetIdxL(UInt li, UInt idx, UInt refPicSetIdx) {( li==0 ? m_RefPicSetIdxL0[idx] : m_RefPicSetIdxL1[idx] ) = refPicSetIdx; }; 1135 Void setRefPicListModificationFlagL(UInt li, Bool flag) { ( li==0 ? m_bRefPicListModificationFlagL0 : m_bRefPicListModificationFlagL1 ) = flag; }; 1136 #endif 1011 1137 }; 1012 1138 … … 1263 1389 TComPic* m_apcRefPicList [2][MAX_NUM_REF+1]; 1264 1390 Int m_aiRefPOCList [2][MAX_NUM_REF+1]; 1391 #if H_MV 1392 Int m_aiRefLayerIdList[2][MAX_NUM_REF+1]; 1393 #endif 1265 1394 Bool m_bIsUsedAsLongTerm[2][MAX_NUM_REF+1]; 1266 1395 Int m_iDepth; … … 1328 1457 1329 1458 Bool m_enableTMVPFlag; 1459 #if H_MV 1460 Int m_layerId; 1461 Int m_viewId; 1462 #if H_3D 1463 Bool m_isDepth; 1464 #endif 1465 #endif 1330 1466 public: 1331 1467 TComSlice(); … … 1434 1570 Void setDepth ( Int iDepth ) { m_iDepth = iDepth; } 1435 1571 1572 #if H_MV 1573 Int getRefLayerId ( RefPicList e, Int iRefIdx) { return m_aiRefLayerIdList[e][iRefIdx]; } 1574 Void setRefLayerId ( Int i, RefPicList e, Int iRefIdx ) { m_aiRefLayerIdList[e][iRefIdx] = i; } 1575 #endif 1576 #if H_MV 1577 Void setRefPicList ( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& interLayerRefPicSet , Bool checkNumPocTotalCurr = false ); 1578 #else 1436 1579 #if FIX1071 1437 1580 Void setRefPicList ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false ); 1438 1581 #else 1439 1582 Void setRefPicList ( TComList<TComPic*>& rcListPic ); 1583 #endif 1440 1584 #endif 1441 1585 Void setRefPOCList (); … … 1485 1629 Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum ); 1486 1630 Void applyReferencePictureSet( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList); 1631 #if H_MV 1632 Void createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector<TComPic*>& refPicSetInterLayer ); 1633 static Void markIvRefPicsAsShortTerm ( std::vector<TComPic*> refPicSetInterLayer ); 1634 static Void markIvRefPicsAsUnused ( TComPicLists* ivPicLists, std::vector<Int> targetDecLayerIdSet, TComVPS* vps, Int curLayerId, Int curPoc ); 1635 1636 1637 Void xPrintRefPicList(); 1638 #endif 1487 1639 Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic ); 1488 1640 Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic ); … … 1560 1712 Bool getEnableTMVPFlag () { return m_enableTMVPFlag;} 1561 1713 1714 #if H_MV 1715 Void setLayerId ( Int layerId ) { m_layerId = layerId; } 1716 Int getLayerId () { return m_layerId; } 1717 Int getLayerIdInVps () { return getVPS()->getLayerIdInVps( m_layerId ); }; 1718 Void setViewId ( Int viewId ) { m_viewId = viewId; } 1719 Int getViewId () { return m_viewId; } 1720 #if H_3D 1721 Void setIsDepth ( Bool isDepth ) { m_isDepth = isDepth; } 1722 Bool getIsDepth () { return m_isDepth; } 1723 #endif 1724 #endif 1562 1725 protected: 1563 1726 TComPic* xGetRefPic (TComList<TComPic*>& rcListPic, 1564 1727 Int poc); 1565 1728 TComPic* xGetLongTermRefPic(TComList<TComPic*>& rcListPic, Int poc, Bool pocHasMsb); 1729 #if H_MV 1730 TComPic* xGetInterLayerRefPic( std::vector<TComPic*>& rcListIlPic, Int layerId ); 1731 #endif 1566 1732 };// END CLASS DEFINITION TComSlice 1567 1733 -
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h
r367 r368 45 45 46 46 47 #if H_MV 48 #define H_3D 0 49 #endif 47 50 48 51 ///// ***** HM 10.1 ********* … … 88 91 #define MAX_VPS_NUM_HRD_PARAMETERS 1 89 92 #define MAX_VPS_OP_SETS_PLUS1 1024 93 #if H_MV 94 #define MAX_VPS_NUH_LAYER_ID_PLUS1 64 95 #define MAX_NUM_SCALABILITY_TYPES 16 96 #define ENC_CFG_CONSOUT_SPACE 29 97 #else 90 98 #define MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 1 99 #endif 91 100 92 101 #define RATE_CONTROL_LAMBDA_DOMAIN 1 ///< JCTVC-K0103, rate control by R-lambda model … … 95 104 #define MAX_CPB_CNT 32 ///< Upper bound of (cpb_cnt_minus1 + 1) 96 105 #define MAX_NUM_LAYER_IDS 64 106 #if H_MV 107 #define MAX_NUM_LAYERS 64 108 #endif 97 109 98 110 #define COEF_REMAIN_BIN_REDUCTION 3 ///< indicates the level at which the VLC … … 509 521 MAIN10 = 2, 510 522 MAINSTILLPICTURE = 3, 523 #if H_MV 524 MAINSTEREO = 4, 525 MAINMULTIVIEW = 5, 526 #if H_3D 527 MAIN3D = 6, 528 #endif 529 #endif 511 530 }; 512 531 } … … 540 559 //! \} 541 560 542 #endif 561 #if H_MV 562 /// scalability types 563 enum ScalabilityType 564 { 565 VIEW_ID = 0, 566 #if H_3D 567 DEPTH_ID = 1, 568 #endif 569 }; 570 #endif 571 #endif -
branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/NALread.cpp
r367 r368 103 103 assert(forbidden_zero_bit == 0); 104 104 nalu.m_nalUnitType = (NalUnitType) bs.read(6); // nal_unit_type 105 #if H_MV 106 nalu.m_layerId = bs.read(6); // layerId 107 #else 105 108 nalu.m_reservedZero6Bits = bs.read(6); // nuh_reserved_zero_6bits 106 109 assert(nalu.m_reservedZero6Bits == 0); 110 #endif 107 111 nalu.m_temporalId = bs.read(3) - 1; // nuh_temporal_id_plus1 108 112 -
branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r367 r368 680 680 if (uiCode) 681 681 { 682 #if H_MV 683 READ_FLAG( uiCode, "inter_view_mv_vert_constraint_flag" ); pcSPS->setInterViewMvVertConstraintFlag(uiCode == 1 ? true : false); 684 #else 682 685 while ( xMoreRbspData() ) 683 686 { 684 687 READ_FLAG( uiCode, "sps_extension_data_flag"); 685 688 } 689 #endif 686 690 } 687 691 } … … 693 697 READ_CODE( 4, uiCode, "vps_video_parameter_set_id" ); pcVPS->setVPSId( uiCode ); 694 698 READ_CODE( 2, uiCode, "vps_reserved_three_2bits" ); assert(uiCode == 3); 699 #if H_MV 700 READ_CODE( 6, uiCode, "vps_max_layers_minus1" ); pcVPS->setMaxLayers( uiCode + 1 ); 701 #else 695 702 READ_CODE( 6, uiCode, "vps_reserved_zero_6bits" ); assert(uiCode == 0); 703 #endif 696 704 READ_CODE( 3, uiCode, "vps_max_sub_layers_minus1" ); pcVPS->setMaxTLayers( uiCode + 1 ); 697 705 READ_FLAG( uiCode, "vps_temporal_id_nesting_flag" ); pcVPS->setTemporalNestingFlag( uiCode ? true:false ); 698 706 assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag()); 707 #if H_MV 708 READ_CODE( 16, uiCode, "vps_extension_offset" ); 709 #else 699 710 READ_CODE( 16, uiCode, "vps_reserved_ffff_16bits" ); assert(uiCode == 0xffff); 711 #endif 700 712 parsePTL ( pcVPS->getPTL(), true, pcVPS->getMaxTLayers()-1); 701 713 #if SIGNAL_BITRATE_PICRATE_IN_VPS … … 727 739 728 740 assert( pcVPS->getNumHrdParameters() < MAX_VPS_OP_SETS_PLUS1 ); 741 #if H_MV 742 assert( pcVPS->getMaxNuhLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 ); 743 READ_CODE( 6, uiCode, "vps_max_nuh_layer_id" ); pcVPS->setMaxNuhLayerId( uiCode ); 744 #else 729 745 assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 ); 730 746 READ_CODE( 6, uiCode, "vps_max_nuh_reserved_zero_layer_id" ); pcVPS->setMaxNuhReservedZeroLayerId( uiCode ); 747 #endif 731 748 READ_UVLC( uiCode, "vps_max_op_sets_minus1" ); pcVPS->setMaxOpSets( uiCode + 1 ); 732 749 for( UInt opsIdx = 1; opsIdx <= ( pcVPS->getMaxOpSets() - 1 ); opsIdx ++ ) 733 750 { 734 751 // Operation point set 752 #if H_MV 753 for( UInt i = 0; i <= pcVPS->getMaxNuhLayerId(); i ++ ) 754 #else 735 755 for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ ) 756 #endif 736 757 { 737 758 READ_FLAG( uiCode, "layer_id_included_flag[opsIdx][i]" ); pcVPS->setLayerIdIncludedFlag( uiCode == 1 ? true : false, opsIdx, i ); … … 772 793 if (uiCode) 773 794 { 795 #if H_MV 796 m_pcBitstream->readOutTrailingBits(); 797 798 READ_FLAG( uiCode, "avc_base_layer_flag" ); pcVPS->setAvcBaseLayerFlag( uiCode == 1 ? true : false ); 799 READ_FLAG( uiCode, "splitting_flag" ); pcVPS->setSplittingFlag( uiCode == 1 ? true : false ); 800 801 // Parse scalability_mask[i] 802 for( Int sIdx = 0; sIdx < MAX_NUM_SCALABILITY_TYPES; sIdx++ ) 803 { 804 READ_FLAG( uiCode, "scalability_mask[i]" ); pcVPS->setScalabilityMask( sIdx, uiCode == 1 ? true : false ); 805 } 806 807 Int numScalabilityTypes = pcVPS->getNumScalabilityTypes(); 808 809 // Parse dimension_id_len_minus1[j] 810 for( Int sIdx = 0; sIdx < numScalabilityTypes; sIdx++ ) 811 { 812 READ_CODE( 3, uiCode, "dimension_id_len_minus1[j]" ); pcVPS->setDimensionIdLen( sIdx, uiCode + 1 ); 813 } 814 815 // vps_nuh_layer_id_present_flag 816 READ_FLAG( uiCode, "vps_nuh_layer_id_present_flag" ); pcVPS->setVpsNuhLayerIdPresentFlag( uiCode == 1 ? true : false ); 817 818 // parse layer_id_in_nuh[i] and derive LayerIdInVps 819 pcVPS->setLayerIdInNuh( 0, 0 ); pcVPS->setLayerIdInVps( 0, 0 ); 820 821 for( Int layer = 1; layer <= pcVPS->getMaxLayers() - 1; layer++ ) 822 { 823 UInt layerIdInNuh; 824 if ( pcVPS->getVpsNuhLayerIdPresentFlag() ) 825 { 826 READ_CODE( 6, uiCode, "layer_id_in_nuh[i]" ); layerIdInNuh = uiCode; 827 } 828 else 829 { 830 layerIdInNuh = layer; 831 } 832 833 pcVPS->setLayerIdInNuh( layer, layerIdInNuh ); 834 pcVPS->setLayerIdInVps( layerIdInNuh, layer ); 835 836 // parse dimension_id[i][j] 837 for( Int sIdx = 0; sIdx < numScalabilityTypes; sIdx++ ) 838 { 839 READ_CODE( pcVPS->getDimensionIdLen( sIdx ), uiCode, "dimension_id[i][j]" ); pcVPS->setDimensionId( layer, sIdx, uiCode ); 840 } 841 } 842 843 for( Int layerSet = 1; layerSet <= pcVPS->getMaxOpSets() - 1; layerSet++ ) 844 { 845 READ_FLAG( uiCode, "vps_profile_present_flag[lsIdx]" ); pcVPS->setVpsProfilePresentFlag( layerSet, uiCode == 1 ? true : false ); 846 if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false ) 847 { 848 READ_UVLC( uiCode, "profile_layer_set_ref_minus1[lsIdx]" ); pcVPS->setProfileLayerSetRefMinus1( layerSet, uiCode ); 849 } 850 851 parsePTL ( pcVPS->getPTL( layerSet ), pcVPS->getVpsProfilePresentFlag( layerSet ), pcVPS->getMaxTLayers()-1); 852 if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false ) 853 { 854 TComPTL temp = *pcVPS->getPTL( layerSet ); 855 *pcVPS->getPTL( layerSet ) = *pcVPS->getPTL( pcVPS->getProfileLayerSetRefMinus1( layerSet ) + 1 ); 856 pcVPS->getPTL( layerSet )->copyLevelFrom( &temp ); 857 } 858 } 859 860 READ_UVLC( uiCode, "num_output_layer_sets" ); pcVPS->setNumOutputLayerSets( uiCode ); 861 862 for( Int layerSet = 0; layerSet < pcVPS->getNumOutputLayerSets(); layerSet++ ) 863 { 864 READ_UVLC( uiCode, "output_layer_set_idx[i]" ); pcVPS->setOutputLayerSetIdx( layerSet, uiCode ); 865 for( Int layer = 0; layer <= pcVPS->getMaxNuhLayerId(); layer++ ) 866 { 867 if( pcVPS->getLayerIdIncludedFlag( pcVPS->getOutputLayerSetIdx( layerSet ), layer ) == true ) 868 { 869 READ_FLAG( uiCode, "output_layer_flag" ); pcVPS->setOutputLayerFlag( layerSet, layer, uiCode == 1 ? true : false ); 870 } 871 } 872 } 873 874 for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ ) 875 { 876 for( Int j = 0; j < i; j++ ) 877 { 878 READ_FLAG( uiCode, "direct_dependency_flag[i][j]" ); pcVPS->setDirectDependencyFlag( i, j, uiCode ); 879 } 880 } 881 882 READ_FLAG( uiCode, "vps_extension2_flag" ); 883 if (uiCode) 884 { 885 while ( xMoreRbspData() ) 886 { 887 READ_FLAG( uiCode, "vps_extension2_data_flag"); 888 } 889 } 890 891 pcVPS->checkVPSExtensionSyntax(); 892 893 pcVPS->calcIvRefLayers(); 894 895 #else 774 896 while ( xMoreRbspData() ) 775 897 { 776 898 READ_FLAG( uiCode, "vps_extension_data_flag"); 777 899 } 900 #endif 778 901 } 779 902 … … 791 914 TComPPS* pps = NULL; 792 915 TComSPS* sps = NULL; 916 #if H_MV 917 TComVPS* vps = NULL; 918 #endif 793 919 794 920 UInt firstSliceSegmentInPic; … … 805 931 //!KS: need to add error handling code here, if SPS is not available 806 932 assert(sps!=0); 933 #if H_MV 934 vps = parameterSetManager->getPrefetchedVPS(sps->getVPSId()); 935 assert(vps!=0); 936 rpcSlice->setVPS(vps); 937 #endif 807 938 rpcSlice->setSPS(sps); 808 939 rpcSlice->setPPS(pps); … … 1392 1523 for (Int i = 0; i < maxNumSubLayersMinus1; i++) 1393 1524 { 1525 #if !H_MV 1394 1526 if(profilePresentFlag) 1395 1527 { 1528 #endif 1396 1529 READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode); 1397 } 1530 #if H_MV 1531 rpcPTL->setSubLayerProfilePresentFlag( i, profilePresentFlag && rpcPTL->getSubLayerProfilePresentFlag(i) ); 1532 #else 1533 } 1534 #endif 1398 1535 READ_FLAG( uiCode, "sub_layer_level_present_flag[i]" ); rpcPTL->setSubLayerLevelPresentFlag (i, uiCode); 1399 1536 } -
branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecGop.cpp
r367 r368 205 205 } 206 206 207 #if !H_3D 207 208 rpcPic->compressMotion(); 209 #endif 208 210 Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B'); 209 211 if (!pcSlice->isReferenced()) c += 32; 210 212 211 213 //-- For time output for each slice 214 #if H_MV 215 printf("\nLayer %2d POC %4d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getLayerId(), 216 pcSlice->getPOC(), 217 pcSlice->getTLayer(), 218 c, 219 pcSlice->getSliceQp() ); 220 #else 212 221 printf("\nPOC %4d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getPOC(), 213 222 pcSlice->getTLayer(), 214 223 c, 215 224 pcSlice->getSliceQp() ); 225 #endif 216 226 217 227 m_dDecTime += (Double)(clock()-iBeforeTime) / CLOCKS_PER_SEC; … … 224 234 for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++) 225 235 { 236 #if H_MV 237 if( pcSlice->getLayerId() != pcSlice->getRefLayerId( RefPicList(iRefList), iRefIndex ) ) 238 { 239 printf( "V%d ", pcSlice->getRefLayerId( RefPicList(iRefList), iRefIndex ) ); 240 } 241 else 242 { 243 #endif 226 244 printf ("%d ", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)); 245 #if H_MV 246 } 247 #endif 227 248 } 228 249 printf ("] "); -
branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp
r367 r368 39 39 #include "TDecTop.h" 40 40 41 #if H_MV 42 ParameterSetManagerDecoder TDecTop::m_parameterSetManagerDecoder; 43 #endif 41 44 //! \ingroup TLibDecoder 42 45 //! \{ … … 57 60 m_bFirstSliceInPicture = true; 58 61 m_bFirstSliceInSequence = true; 62 #if H_MV 63 m_layerId = 0; 64 m_viewId = 0; 65 #if H_3D 66 m_isDepth = false; 67 #endif 68 #endif 59 69 } 60 70 … … 86 96 { 87 97 // initialize ROM 98 #if !H_MV 88 99 initROM(); 100 #endif 89 101 m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO); 90 102 m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder ); … … 100 112 { 101 113 TComPic* pcPic = *(iterPic++); 114 #if H_MV 115 if( pcPic ) 116 { 117 #endif 102 118 pcPic->destroy(); 103 119 104 120 delete pcPic; 105 121 pcPic = NULL; 122 #if H_MV 123 } 124 #endif 106 125 } 107 126 … … 110 129 m_cLoopFilter. destroy(); 111 130 131 #if !H_MV 112 132 // destroy ROM 113 133 destroyROM(); 134 #endif 114 135 } 115 136 … … 177 198 } 178 199 200 #if H_MV 201 Void TDecTop::endPicDecoding(Int& poc, TComList<TComPic*>*& rpcListPic, std::vector<Int>& targetDecLayerIdSet ) 202 #else 179 203 Void TDecTop::executeLoopFilters(Int& poc, TComList<TComPic*>*& rpcListPic) 204 #endif 180 205 { 181 206 if (!m_pcPic) … … 195 220 rpcListPic = &m_cListPic; 196 221 m_cCuDecoder.destroy(); 222 #if H_MV 223 TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer ); 224 TComSlice::markIvRefPicsAsUnused ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc ); 225 #endif 197 226 m_bFirstSliceInPicture = true; 198 227 … … 311 340 } 312 341 342 #if H_MV 343 Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, Bool newLayerFlag ) 344 { 345 assert( nalu.m_layerId == m_layerId ); 346 347 #else 313 348 Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay ) 314 349 { 350 #endif 315 351 TComPic*& pcPic = m_pcPic; 316 352 m_apcSlicePilot->initSlice(); … … 337 373 m_apcSlicePilot->setTLayerInfo(nalu.m_temporalId); 338 374 375 #if H_MV 376 m_apcSlicePilot->setLayerId( nalu.m_layerId ); 377 #endif 339 378 m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder); 340 379 380 #if H_MV 381 TComVPS* vps = m_apcSlicePilot->getVPS(); 382 Int layerIdInVps = vps->getLayerIdInVps( nalu.m_layerId ); 383 384 setViewId( vps->getViewId( layerIdInVps ) ); 385 m_apcSlicePilot->setViewId( getViewId() ); 386 #if H_3D 387 setIsDepth( vps->getDepthId( layerIdInVps ) == 1 ); 388 m_apcSlicePilot->setIsDepth( getIsDepth() ); 389 #endif 390 #endif 341 391 // Skip pictures due to random access 342 392 if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay)) … … 365 415 m_prevPOC = m_apcSlicePilot->getPOC(); 366 416 } 417 #if H_MV 418 if ( newLayerFlag ) 419 { 420 return false; 421 } 422 #endif 367 423 // actual decoding starts here 368 424 xActivateParameterSets(); … … 384 440 m_cPrediction.initTempBuff(); 385 441 m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS()); 442 #if H_MV 443 m_apcSlicePilot->createAndApplyIvReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer ); 444 #endif 386 445 // Get a new picture buffer 387 446 xGetNewPicBuffer (m_apcSlicePilot, pcPic); … … 515 574 pcPic->setTLayer(nalu.m_temporalId); 516 575 576 #if H_MV 577 pcPic->setLayerId( nalu.m_layerId ); 578 pcPic->setViewId ( getViewId() ); 579 #if H_3D 580 pcPic->setIsDepth( getIsDepth() ); 581 #endif 582 #endif 517 583 if (bNextSlice) 518 584 { 519 585 pcSlice->checkCRA(pcSlice->getRPS(), m_pocCRA, m_prevRAPisBLA, m_cListPic ); 520 586 // Set reference list 587 #if H_MV 588 pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true ); 589 #else 521 590 #if FIX1071 522 591 pcSlice->setRefPicList( m_cListPic, true ); … … 525 594 #endif 526 595 596 #endif 527 597 // For generalized B 528 598 // note: maybe not existed case (always L0 is copied to L1 if L1 is empty) … … 662 732 } 663 733 734 #if H_MV 735 Bool TDecTop::decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayerFlag) 736 #else 664 737 Bool TDecTop::decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay) 738 #endif 665 739 { 666 740 // Initialize entropy decoder … … 703 777 case NAL_UNIT_CODED_SLICE_RASL_N: 704 778 case NAL_UNIT_CODED_SLICE_RASL_R: 779 #if H_MV 780 return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag); 781 #else 705 782 return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay); 783 #endif 706 784 break; 707 785 default: … … 783 861 } 784 862 863 #if H_MV 864 TComPic* TDecTop::getPic( Int poc ) 865 { 866 xGetPic( m_layerId, poc ); 867 TComList<TComPic*>* listPic = getListPic(); 868 TComPic* pcPic = NULL; 869 for(TComList<TComPic*>::iterator it=listPic->begin(); it!=listPic->end(); it++) 870 { 871 if( (*it)->getPOC() == poc ) 872 { 873 pcPic = *it ; 874 break ; 875 } 876 } 877 return pcPic; 878 } 879 880 TComPic* TDecTop::xGetPic( Int layerId, Int poc ) 881 { 882 return m_ivPicLists->getPic( layerId, poc ) ; 883 } 884 885 #endif 785 886 //! \} -
branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h
r367 r368 61 61 // ==================================================================================================================== 62 62 63 #if H_MV 64 class TAppDecTop; 65 #endif 63 66 /// decoder class 64 67 class TDecTop … … 72 75 73 76 TComList<TComPic*> m_cListPic; // Dynamic buffer 77 #if H_MV 78 static ParameterSetManagerDecoder m_parameterSetManagerDecoder; // storage for parameter sets 79 #else 74 80 ParameterSetManagerDecoder m_parameterSetManagerDecoder; // storage for parameter sets 81 #endif 75 82 TComSlice* m_apcSlicePilot; 76 83 … … 98 105 Bool m_bFirstSliceInPicture; 99 106 Bool m_bFirstSliceInSequence; 107 #if H_MV 108 // For H_MV m_bFirstSliceInSequence indicates first slice in sequence of the particular layer 109 Int m_layerId; 110 Int m_viewId; 111 TComPicLists* m_ivPicLists; 112 std::vector<TComPic*> m_refPicSetInterLayer; 113 #if H_3D 114 Bool m_isDepth; 115 #endif 116 #endif 100 117 101 118 public: … … 109 126 110 127 Void init(); 128 #if H_MV 129 Bool decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayer ); 130 #else 111 131 Bool decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay); 132 #endif 112 133 113 134 Void deletePicBuffer(); 114 135 136 #if H_MV 137 Void endPicDecoding(Int& poc, TComList<TComPic*>*& rpcListPic, std::vector<Int>& targetDecLayerIdSet); 138 #else 115 139 Void executeLoopFilters(Int& poc, TComList<TComPic*>*& rpcListPic); 140 #endif 116 141 142 #if H_MV 143 TComPic* getPic ( Int poc ); 144 TComList<TComPic*>* getListPic () { return &m_cListPic; } 145 Void setIvPicLists ( TComPicLists* picLists) { m_ivPicLists = picLists; } 146 147 Int getCurrPoc () { return m_apcSlicePilot->getPOC(); } 148 Void setLayerId ( Int layer) { m_layerId = layer; } 149 Int getLayerId () { return m_layerId; } 150 Void setViewId ( Int viewId ) { m_viewId = viewId; } 151 Int getViewId () { return m_viewId; } 152 #if H_3D 153 Void setIsDepth ( Bool isDepth ) { m_isDepth = isDepth; } 154 Bool getIsDepth () { return m_isDepth; } 155 #endif 156 #endif 117 157 protected: 118 158 Void xGetNewPicBuffer (TComSlice* pcSlice, TComPic*& rpcPic); … … 120 160 121 161 Void xActivateParameterSets(); 162 #if H_MV 163 TComPic* xGetPic( Int layerId, Int poc ); 164 Bool xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, Bool newLayerFlag ); 165 #else 122 166 Bool xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay); 167 #endif 123 168 Void xDecodeVPS(); 124 169 Void xDecodeSPS(); -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.cpp
r367 r368 53 53 bsNALUHeader.write(0,1); // forbidden_zero_bit 54 54 bsNALUHeader.write(nalu.m_nalUnitType, 6); // nal_unit_type 55 #if H_MV 56 bsNALUHeader.write(nalu.m_layerId, 6); // layerId 57 #else 55 58 bsNALUHeader.write(nalu.m_reservedZero6Bits, 6); // nuh_reserved_zero_6bits 59 #endif 56 60 bsNALUHeader.write(nalu.m_temporalId+1, 3); // nuh_temporal_id_plus1 57 61 … … 142 146 { 143 147 naluDest.m_nalUnitType = naluSrc.m_nalUnitType; 148 #if H_MV 149 naluDest.m_layerId = naluSrc.m_layerId; 150 #else 144 151 naluDest.m_reservedZero6Bits = naluSrc.m_reservedZero6Bits; 152 #endif 145 153 naluDest.m_temporalId = naluSrc.m_temporalId; 146 154 naluDest.m_Bitstream = naluSrc.m_Bitstream; -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.h
r367 r368 57 57 NalUnitType nalUnitType, 58 58 UInt temporalID = 0, 59 #if H_MV 60 Int layerId = 0) 61 #else 59 62 UInt reserved_zero_6bits = 0) 63 #endif 64 #if H_MV 65 : NALUnit(nalUnitType, temporalID, layerId) 66 #else 60 67 : NALUnit(nalUnitType, temporalID, reserved_zero_6bits) 68 #endif 61 69 , m_Bitstream() 62 70 {} -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.cpp
r367 r368 36 36 */ 37 37 38 #if !H_MV 38 39 #include "TEncAnalyze.h" 40 #endif 39 41 40 42 //! \ingroup TLibEncoder … … 45 47 ////////////////////////////////////////////////////////////////////// 46 48 49 #if !H_MV 47 50 TEncAnalyze m_gcAnalyzeAll; 48 51 TEncAnalyze m_gcAnalyzeI; 49 52 TEncAnalyze m_gcAnalyzeP; 50 53 TEncAnalyze m_gcAnalyzeB; 54 #endif 51 55 52 56 //! \} -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.h
r367 r368 150 150 }; 151 151 152 #if !H_MV 152 153 extern TEncAnalyze m_gcAnalyzeAll; 153 154 extern TEncAnalyze m_gcAnalyzeI; 154 155 extern TEncAnalyze m_gcAnalyzeP; 155 156 extern TEncAnalyze m_gcAnalyzeB; 157 #endif 156 158 157 159 //! \} -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r367 r368 549 549 } 550 550 551 #if H_MV 552 WRITE_FLAG( 1, "sps_extension_flag" ); 553 554 WRITE_FLAG( pcSPS->getInterViewMvVertConstraintFlag() ? 1 : 0, "inter_view_mv_vert_constraint_flag" ); 555 #else 551 556 WRITE_FLAG( 0, "sps_extension_flag" ); 557 #endif 552 558 } 553 559 … … 556 562 WRITE_CODE( pcVPS->getVPSId(), 4, "vps_video_parameter_set_id" ); 557 563 WRITE_CODE( 3, 2, "vps_reserved_three_2bits" ); 564 #if H_MV 565 WRITE_CODE( pcVPS->getMaxLayers() - 1, 6, "vps_max_layers_minus1" ); 566 #else 558 567 WRITE_CODE( 0, 6, "vps_reserved_zero_6bits" ); 568 #endif 559 569 WRITE_CODE( pcVPS->getMaxTLayers() - 1, 3, "vps_max_sub_layers_minus1" ); 560 570 WRITE_FLAG( pcVPS->getTemporalNestingFlag(), "vps_temporal_id_nesting_flag" ); 561 571 assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag()); 572 #if H_MV 573 WRITE_CODE( 0xffff, 16, "vps_extension_offset" ); 574 #else 562 575 WRITE_CODE( 0xffff, 16, "vps_reserved_ffff_16bits" ); 576 #endif 563 577 codePTL( pcVPS->getPTL(), true, pcVPS->getMaxTLayers() - 1 ); 564 578 #if SIGNAL_BITRATE_PICRATE_IN_VPS … … 583 597 584 598 assert( pcVPS->getNumHrdParameters() <= MAX_VPS_NUM_HRD_PARAMETERS ); 599 #if H_MV 600 assert( pcVPS->getMaxNuhLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 ); 601 WRITE_CODE( pcVPS->getMaxNuhLayerId(), 6, "vps_max_nuh_layer_id" ); 602 #else 585 603 assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 ); 586 604 WRITE_CODE( pcVPS->getMaxNuhReservedZeroLayerId(), 6, "vps_max_nuh_reserved_zero_layer_id" ); 605 #endif 587 606 pcVPS->setMaxOpSets(1); 588 607 WRITE_UVLC( pcVPS->getMaxOpSets() - 1, "vps_max_op_sets_minus1" ); … … 590 609 { 591 610 // Operation point set 611 #if H_MV 612 for( UInt i = 0; i <= pcVPS->getMaxNuhLayerId(); i ++ ) 613 #else 592 614 for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ ) 615 #endif 593 616 { 594 617 // Only applicable for version 1 … … 631 654 } 632 655 #endif 656 #if H_MV 657 WRITE_FLAG( 1, "vps_extension_flag" ); 658 659 m_pcBitIf->writeAlignOne(); 660 661 WRITE_FLAG( pcVPS->getAvcBaseLayerFlag() ? 1 : 0, "avc_base_layer_flag" ); 662 WRITE_FLAG( pcVPS->getSplittingFlag() ? 1 : 0, "splitting_flag" ); 663 664 for( Int type = 0; type < MAX_NUM_SCALABILITY_TYPES; type++ ) 665 { 666 WRITE_FLAG( pcVPS->getScalabilityMask( type ) ? 1 : 0, "scalability_mask[i]" ); 667 } 668 669 for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes( ); sIdx++ ) 670 { 671 WRITE_CODE( pcVPS->getDimensionIdLen( sIdx ) - 1 , 3, "dimension_id_len_minus1[j]"); 672 } 673 674 WRITE_FLAG( pcVPS->getVpsNuhLayerIdPresentFlag() ? 1 : 0, "vps_nuh_layer_id_present_flag"); 675 676 for( Int layer = 1; layer <= pcVPS->getMaxLayers() - 1; layer++ ) 677 { 678 if (pcVPS->getVpsNuhLayerIdPresentFlag() ) 679 WRITE_CODE( pcVPS->getLayerIdInNuh( layer ), 6, "layer_id_in_nuh[i]"); 680 for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes() ; sIdx++ ) 681 { 682 WRITE_CODE( pcVPS->getDimensionId( layer, sIdx ), pcVPS->getDimensionIdLen( sIdx ), "dimension_id[i][j]"); 683 } 684 } 685 686 for( Int layerSet = 1; layerSet <= pcVPS->getMaxOpSets() - 1; layerSet++ ) 687 { 688 WRITE_FLAG( pcVPS->getVpsProfilePresentFlag( layerSet ) ? 1 : 0, "vps_profile_present_flag[lsIdx]" ); 689 if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false ) 690 { 691 WRITE_UVLC( pcVPS->getProfileLayerSetRefMinus1( layerSet ), "profile_layer_set_ref_minus1[lsIdx]" ); 692 } 693 codePTL( pcVPS->getPTL( layerSet ), pcVPS->getVpsProfilePresentFlag( layerSet ), pcVPS->getMaxTLayers() - 1 ); 694 } 695 696 WRITE_UVLC( pcVPS->getNumOutputLayerSets(), "num_output_layer_sets" ); 697 698 for( Int layerSet = 0; layerSet < pcVPS->getNumOutputLayerSets(); layerSet++ ) 699 { 700 WRITE_UVLC( pcVPS->getOutputLayerSetIdx( layerSet ), "output_layer_set_idx[i]" ); 701 for( Int layer = 0; layer <= pcVPS->getMaxNuhLayerId(); layer++ ) 702 { 703 if( pcVPS->getLayerIdIncludedFlag( pcVPS->getOutputLayerSetIdx( layerSet ), layer ) == true ) 704 { 705 WRITE_FLAG( pcVPS->getOutputLayerFlag( layerSet, layer ) ? 1 : 0, "output_layer_flag" ); 706 } 707 } 708 } 709 710 for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ ) 711 { 712 for( Int j = 0; j < i; j++ ) 713 { 714 WRITE_FLAG( pcVPS->getDirectDependencyFlag( i, j ), "direct_dependency_flag[i][j]" ); 715 } 716 } 717 WRITE_FLAG( 0, "vps_extension2_flag" ); 718 #else 633 719 WRITE_FLAG( 0, "vps_extension_flag" ); 720 #endif 634 721 635 722 //future extensions here.. … … 1004 1091 for (Int i = 0; i < maxNumSubLayersMinus1; i++) 1005 1092 { 1093 #if !H_MV 1006 1094 if(profilePresentFlag) 1007 1095 { 1096 #endif 1008 1097 WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" ); 1009 } 1098 #if !H_MV 1099 } 1100 #endif 1010 1101 1011 1102 WRITE_FLAG( pcPTL->getSubLayerLevelPresentFlag(i), "sub_layer_level_present_flag[i]" ); -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h
r367 r368 69 69 Int m_numRefIdc; 70 70 Int m_refIdc[MAX_NUM_REF_PICS+1]; 71 #if H_MV 72 Int m_numInterViewRefPics; 73 Int m_interViewRefs [MAX_NUM_REF_PICS]; 74 Int m_interViewRefPosL[2][MAX_NUM_REF_PICS]; 75 #endif 71 76 GOPEntry() 72 77 : m_POC(-1) … … 83 88 , m_deltaRPS(0) 84 89 , m_numRefIdc(0) 90 #if H_MV 91 , m_numInterViewRefPics(0) 92 #endif 85 93 { 86 94 ::memset( m_referencePics, 0, sizeof(m_referencePics) ); 87 95 ::memset( m_usedByCurrPic, 0, sizeof(m_usedByCurrPic) ); 88 96 ::memset( m_refIdc, 0, sizeof(m_refIdc) ); 97 #if H_MV 98 ::memset( m_interViewRefs, 0, sizeof(m_interViewRefs) ); 99 ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) ); ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) ); 100 #endif 89 101 } 90 102 }; … … 127 139 UInt m_uiDecodingRefreshType; ///< the type of decoding refresh employed for the random access. 128 140 Int m_iGOPSize; 141 #if H_MV 142 GOPEntry m_GOPList[MAX_GOP+1]; 143 #else 129 144 GOPEntry m_GOPList[MAX_GOP]; 145 #endif 130 146 Int m_extraRPSs; 131 147 Int m_maxDecPicBuffering[MAX_TLAYER]; … … 337 353 Bool m_useStrongIntraSmoothing; ///< enable the use of strong intra smoothing (bi_linear interpolation) for 32x32 blocks when reference samples are flat. 338 354 355 #if H_MV 356 Int m_layerId; 357 Int m_layerIdInVps; 358 Int m_viewId; 359 #if H_3D 360 Bool m_isDepth; 361 #endif 362 #endif 339 363 public: 340 364 TEncCfg() 341 365 : m_puiColumnWidth() 342 366 , m_puiRowHeight() 367 #if H_MV 368 , m_layerId(-1) 369 , m_layerIdInVps(-1) 370 , m_viewId(-1) 371 #if H_3D 372 , m_isDepth(false) 373 #endif 374 #endif 343 375 {} 344 376 … … 362 394 Void setFramesToBeEncoded ( Int i ) { m_framesToBeEncoded = i; } 363 395 396 #if H_MV 397 Void setLayerId ( Int layerId ) { m_layerId = layerId; } 398 Int getLayerId () { return m_layerId; } 399 Int getLayerIdInVps () { return m_layerIdInVps; } 400 Void setLayerIdInVps ( Int layerIdInVps) { m_layerIdInVps = layerIdInVps; } 401 Void setViewId ( Int viewId ) { m_viewId = viewId; } 402 Int getViewId () { return m_viewId; } 403 #if H_3D 404 Void setIsDepth ( Bool isDepth ) { m_isDepth = isDepth; } 405 Bool getIsDepth () { return m_isDepth; } 406 #endif 407 #endif 364 408 //====== Coding Structure ======== 365 409 Void setIntraPeriod ( Int i ) { m_uiIntraPeriod = (UInt)i; } 366 410 Void setDecodingRefreshType ( Int i ) { m_uiDecodingRefreshType = (UInt)i; } 367 411 Void setGOPSize ( Int i ) { m_iGOPSize = i; } 412 #if H_MV 413 Void setGopList ( GOPEntry* GOPList ) { for ( Int i = 0; i < MAX_GOP+1; i++ ) m_GOPList[i] = GOPList[i]; } 414 #else 368 415 Void setGopList ( GOPEntry* GOPList ) { for ( Int i = 0; i < MAX_GOP; i++ ) m_GOPList[i] = GOPList[i]; } 416 #endif 369 417 Void setExtraRPSs ( Int i ) { m_extraRPSs = i; } 370 418 GOPEntry getGOPEntry ( Int i ) { return m_GOPList[i]; } -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp
r367 r368 100 100 #endif 101 101 #endif 102 #if H_MV 103 m_layerId = 0; 104 m_viewId = 0; 105 m_pocLastCoded = -1; 106 #if H_3D 107 m_isDepth = false; 108 #endif 109 #endif 102 110 return; 103 111 } … … 139 147 m_totalCoded = 0; 140 148 149 #if H_MV 150 m_ivPicLists = pcTEncTop->getIvPicLists(); 151 m_layerId = pcTEncTop->getLayerId(); 152 m_viewId = pcTEncTop->getViewId(); 153 #if H_3D 154 m_isDepth = pcTEncTop->getIsDepth(); 155 #endif 156 #endif 141 157 } 142 158 … … 342 358 // Public member functions 343 359 // ==================================================================================================================== 360 #if H_MV 361 Void TEncGOP::initGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP) 362 { 363 xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut ); 364 m_iNumPicCoded = 0; 365 } 366 #endif 367 #if H_MV 368 Void TEncGOP::compressPicInGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid) 369 #else 344 370 Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP) 371 #endif 345 372 { 346 373 TComPic* pcPic; … … 354 381 TComOutputBitstream* pcSubstreamsOut = NULL; 355 382 383 #if !H_MV 356 384 xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut ); 357 385 358 386 m_iNumPicCoded = 0; 387 #endif 359 388 SEIPictureTiming pictureTimingSEI; 360 389 #if L0208_SOP_DESCRIPTION_SEI … … 379 408 UInt *accumNalsDU = NULL; 380 409 SEIDecodingUnitInfo decodingUnitInfoSEI; 410 #if !H_MV 381 411 for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ ) 412 #endif 382 413 { 383 414 UInt uiColDir = 1; … … 438 469 if(pocCurr>=m_pcCfg->getFramesToBeEncoded()) 439 470 { 471 #if H_MV 472 delete pcBitstreamRedirect; 473 return; 474 #else 440 475 continue; 476 #endif 441 477 } 442 478 … … 459 495 pcSlice->setLastIDR(m_iLastIDR); 460 496 pcSlice->setSliceIdx(0); 497 #if H_MV 498 pcPic ->setLayerId ( getLayerId() ); 499 pcPic ->setViewId ( getViewId() ); 500 pcSlice->setLayerId ( getLayerId() ); 501 pcSlice->setViewId ( getViewId() ); 502 pcSlice->setVPS ( m_pcEncTop->getVPS() ); 503 #if H_3D 504 pcPic ->setIsDepth( getIsDepth() ); 505 pcSlice->setIsDepth( getIsDepth() ); 506 #endif 507 #endif 461 508 //set default slice level flag to the same as SPS level flag 462 509 pcSlice->setLFCrossSliceBoundaryFlag( pcSlice->getPPS()->getLoopFilterAcrossSlicesEnabledFlag() ); … … 496 543 } 497 544 498 if(pcSlice->getSliceType()==B_SLICE&&m_pcCfg->getGOPEntry(iGOPid).m_sliceType=='P') 499 { 500 pcSlice->setSliceType(P_SLICE); 501 } 545 #if H_MV 502 546 // Set the nal unit type 503 547 pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR)); 548 if( pcSlice->getSliceType() == B_SLICE ) 549 { 550 if( m_pcCfg->getGOPEntry( ( pcSlice->getRapPicFlag() && getLayerId() > 0 ) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) 551 { 552 pcSlice->setSliceType( P_SLICE ); 553 } 554 } 555 #else 556 if(pcSlice->getSliceType()==B_SLICE&&m_pcCfg->getGOPEntry(iGOPid).m_sliceType=='P') 557 { 558 pcSlice->setSliceType(P_SLICE); 559 } 560 // Set the nal unit type 561 pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR)); 562 #endif 504 563 if(pcSlice->getTemporalLayerNonReferenceFlag()) 505 564 { … … 589 648 refPicListModification->setRefPicListModificationFlagL0(0); 590 649 refPicListModification->setRefPicListModificationFlagL1(0); 650 #if H_MV 651 pcSlice->createAndApplyIvReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer ); 652 pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ).m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) ); 653 pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ).m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) ); 654 xSetRefPicListModificationsMvc( pcSlice, pocCurr, iGOPid ); 655 #else 591 656 pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures())); 592 657 pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures())); 658 #endif 593 659 594 660 #if ADAPTIVE_QP_SELECTION … … 597 663 598 664 // Set reference list 665 #if H_MV 666 pcSlice->setRefPicList( rcListPic, m_refPicSetInterLayer ); 667 #else 599 668 pcSlice->setRefPicList ( rcListPic ); 669 #endif 600 670 601 671 // Slice info. refinement 672 #if H_MV 673 if ( pcSlice->getSliceType() == B_SLICE ) 674 { 675 if( m_pcCfg->getGOPEntry( ( pcSlice->getRapPicFlag() == true && getLayerId() > 0 ) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) 676 { 677 pcSlice->setSliceType( P_SLICE ); 678 } 679 } 680 #else 602 681 if ( (pcSlice->getSliceType() == B_SLICE) && (pcSlice->getNumRefIdx(REF_PIC_LIST_1) == 0) ) 603 682 { 604 683 pcSlice->setSliceType ( P_SLICE ); 605 684 } 685 #endif 606 686 #if !L0034_COMBINED_LIST_CLEANUP 607 687 if (pcSlice->getSliceType() != B_SLICE || !pcSlice->getSPS()->getUseLComb()) … … 1020 1100 { 1021 1101 OutputNALUnit nalu(NAL_UNIT_VPS); 1102 #if H_MV 1103 if( getLayerId() == 0 ) 1104 { 1105 #endif 1022 1106 m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); 1023 1107 m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS()); … … 1028 1112 #endif 1029 1113 1114 #if H_MV 1115 } 1116 nalu = NALUnit(NAL_UNIT_SPS, 0, getLayerId()); 1117 #else 1030 1118 nalu = NALUnit(NAL_UNIT_SPS); 1119 #endif 1031 1120 m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); 1032 1121 if (m_bSeqFirst) … … 1061 1150 #endif 1062 1151 1152 #if H_MV 1153 nalu = NALUnit(NAL_UNIT_PPS, 0, getLayerId()); 1154 #else 1063 1155 nalu = NALUnit(NAL_UNIT_PPS); 1156 #endif 1064 1157 m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); 1065 1158 m_pcEntropyCoder->encodePPS(pcSlice->getPPS()); … … 1383 1476 m_pcEntropyCoder->resetEntropy (); 1384 1477 /* start slice NALunit */ 1478 #if H_MV 1479 OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->getTLayer(), getLayerId() ); 1480 #else 1385 1481 OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->getTLayer() ); 1482 #endif 1386 1483 Bool sliceSegment = (!pcSlice->isNextSlice()); 1387 1484 if (!sliceSegment) … … 1610 1707 } 1611 1708 1709 #if !H_3D 1612 1710 pcPic->compressMotion(); 1711 #endif 1712 #if H_MV 1713 m_pocLastCoded = pcPic->getPOC(); 1714 #endif 1613 1715 //-- For time output for each slice 1614 1716 Double dEncTime = (Double)(clock()-iBeforeTime) / CLOCKS_PER_SEC; … … 1921 2023 1922 2024 pcPic->setReconMark ( true ); 2025 #if H_MV 2026 TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer ); 2027 std::vector<Int> temp; 2028 TComSlice::markIvRefPicsAsUnused ( m_ivPicLists, temp, pcPic->getSlice(0)->getVPS(), m_layerId, pcPic->getPOC() ); 2029 #endif 1923 2030 m_bFirst = false; 1924 2031 m_iNumPicCoded++; … … 1941 2048 if( accumNalsDU != NULL) delete accumNalsDU; 1942 2049 2050 #if !H_MV 1943 2051 assert ( m_iNumPicCoded == iNumPicRcvd ); 2052 #endif 1944 2053 } 1945 2054 2055 #if !H_MV 1946 2056 Void TEncGOP::printOutSummary(UInt uiNumAllPicCoded) 1947 2057 { … … 1979 2089 printf("\nRVM: %.3lf\n" , xCalculateRVM()); 1980 2090 } 2091 #endif 1981 2092 1982 2093 Void TEncGOP::preLoopFilterPicAll( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits ) … … 2254 2365 2255 2366 //===== add PSNR ===== 2367 #if H_MV 2368 m_pcEncTop->getAnalyzeAll()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2369 #else 2256 2370 m_gcAnalyzeAll.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2371 #endif 2257 2372 TComSlice* pcSlice = pcPic->getSlice(0); 2258 2373 if (pcSlice->isIntra()) 2259 2374 { 2375 #if H_MV 2376 m_pcEncTop->getAnalyzeI()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2377 #else 2260 2378 m_gcAnalyzeI.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2379 #endif 2261 2380 } 2262 2381 if (pcSlice->isInterP()) 2263 2382 { 2383 #if H_MV 2384 m_pcEncTop->getAnalyzeP()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2385 #else 2264 2386 m_gcAnalyzeP.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2387 #endif 2265 2388 } 2266 2389 if (pcSlice->isInterB()) 2267 2390 { 2391 #if H_MV 2392 m_pcEncTop->getAnalyzeB()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2393 #else 2268 2394 m_gcAnalyzeB.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits); 2395 #endif 2269 2396 } 2270 2397 … … 2273 2400 2274 2401 #if ADAPTIVE_QP_SELECTION 2402 #if H_MV 2403 printf("Layer %3d POC %4d TId: %1d ( %c-SLICE, nQP %d QP %d ) %10d bits", 2404 pcSlice->getLayerId(), 2405 pcSlice->getPOC(), 2406 pcSlice->getTLayer(), 2407 c, 2408 pcSlice->getSliceQpBase(), 2409 pcSlice->getSliceQp(), 2410 uibits ); 2411 #else 2275 2412 printf("POC %4d TId: %1d ( %c-SLICE, nQP %d QP %d ) %10d bits", 2276 2413 pcSlice->getPOC(), … … 2280 2417 pcSlice->getSliceQp(), 2281 2418 uibits ); 2419 #endif 2420 #else 2421 #if H_MV 2422 printf("Layer %3d POC %4d TId: %1d ( %c-SLICE, QP %d ) %10d bits", 2423 pcSlice->getLayerId(), 2424 pcSlice->getPOC()-pcSlice->getLastIDR(), 2425 pcSlice->getTLayer(), 2426 c, 2427 pcSlice->getSliceQp(), 2428 uibits ); 2282 2429 #else 2283 2430 printf("POC %4d TId: %1d ( %c-SLICE, QP %d ) %10d bits", … … 2287 2434 pcSlice->getSliceQp(), 2288 2435 uibits ); 2436 #endif 2289 2437 2290 2438 #endif … … 2297 2445 for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++) 2298 2446 { 2447 #if H_MV 2448 if( pcSlice->getLayerId() != pcSlice->getRefLayerId( RefPicList(iRefList), iRefIndex ) ) 2449 { 2450 printf( "V%d ", pcSlice->getRefLayerId( RefPicList(iRefList), iRefIndex ) ); 2451 } 2452 else 2453 { 2454 #endif 2299 2455 printf ("%d ", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)-pcSlice->getLastIDR()); 2456 #if H_MV 2457 } 2458 #endif 2300 2459 } 2301 2460 printf("]"); … … 2663 2822 } 2664 2823 #endif 2824 #if H_MV 2825 Void TEncGOP::xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid ) 2826 { 2827 TComVPS* vps = pcSlice->getVPS(); 2828 Int layer = pcSlice->getLayerIdInVps( ); 2829 2830 if( pcSlice->getSliceType() == I_SLICE || !(pcSlice->getPPS()->getListsModificationPresentFlag()) || vps->getNumDirectRefLayers( layer ) == 0 ) 2831 { 2832 return; 2833 } 2834 2835 // analyze inter-view modifications 2836 GOPEntry ge = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && ( layer > 0) ) ? MAX_GOP : iGOPid ); 2837 2838 TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification(); 2839 2840 Int maxRefListSize = pcSlice->getNumRpsCurrTempList(); 2841 Int numTemporalRefs = maxRefListSize - vps->getNumDirectRefLayers( layer ); 2842 2843 2844 for (Int li = 0; li < 2; li ++) // Loop over lists L0 and L1 2845 { 2846 Int numModifications = 0; 2847 2848 for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) 2849 { 2850 numModifications += ( ge.m_interViewRefPosL[li][k] >= 0 ) ? 1 : 0; 2851 } 2852 2853 // set inter-view modifications 2854 if( (maxRefListSize > 1) && (numModifications > 0) ) 2855 { 2856 refPicListModification->setRefPicListModificationFlagL( li, true ); 2857 Int tempList[16]; 2858 for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; } 2859 2860 Bool isModified = false; 2861 for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) 2862 { 2863 if( ge.m_interViewRefPosL[li][k] >= 0 ) 2864 { 2865 Int orgIdx = numTemporalRefs; 2866 Int targetIdx = ge.m_interViewRefPosL[ li ][ k ]; 2867 for( Int idx = 0; idx < vps->getNumDirectRefLayers( layer ); idx++ ) 2868 { 2869 Int refLayer = vps->getLayerIdInVps( vps->getRefLayerId( layer, idx ) ); 2870 if( ( layer + ge.m_interViewRefs[ k ]) == refLayer ) 2871 { 2872 tempList[ targetIdx ] = orgIdx; 2873 isModified = ( targetIdx != orgIdx ); 2874 } 2875 orgIdx++; 2876 } 2877 } 2878 } 2879 if( isModified ) 2880 { 2881 Int temporalRefIdx = 0; 2882 for( Int i = 0; i < pcSlice->getNumRefIdx( ( li == 0 ) ? REF_PIC_LIST_0 : REF_PIC_LIST_1 ); i++ ) 2883 { 2884 if( tempList[i] >= 0 ) 2885 { 2886 refPicListModification->setRefPicSetIdxL( li, i, tempList[i] ); 2887 } 2888 else 2889 { 2890 refPicListModification->setRefPicSetIdxL( li, i, temporalRefIdx ); 2891 temporalRefIdx++; 2892 } 2893 } 2894 } 2895 else 2896 { 2897 refPicListModification->setRefPicListModificationFlagL( li, false ); 2898 } 2899 } 2900 } 2901 } 2902 #endif 2665 2903 //! \} -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h
r367 r368 97 97 SEIWriter m_seiWriter; 98 98 99 #if H_MV 100 TComPicLists* m_ivPicLists; 101 std::vector<TComPic*> m_refPicSetInterLayer; 102 103 Int m_pocLastCoded; 104 Int m_layerId; 105 Int m_viewId; 106 #if H_3D 107 Bool m_isDepth; 108 #endif 109 #endif 99 110 //--Adaptive Loop filter 100 111 TEncSampleAdaptiveOffset* m_pcSAO; … … 133 144 134 145 Void init ( TEncTop* pcTEncTop ); 146 #if H_MV 147 Void initGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP); 148 Void compressPicInGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid ); 149 #else 135 150 Void compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec, std::list<AccessUnit>& accessUnitsInGOP ); 151 #endif 136 152 Void xAttachSliceDataToNalUnit (OutputNALUnit& rNalu, TComOutputBitstream*& rpcBitstreamRedirect); 137 153 154 #if H_MV 155 Int getPocLastCoded () { return m_pocLastCoded; } 156 Int getLayerId () { return m_layerId; } 157 Int getViewId () { return m_viewId; } 158 #if H_3D 159 Bool getIsDepth () { return m_isDepth; } 160 #endif 161 #endif 138 162 139 163 Int getGOPSize() { return m_iGopSize; } … … 141 165 TComList<TComPic*>* getListPic() { return m_pcListPic; } 142 166 167 #if !H_MV 143 168 Void printOutSummary ( UInt uiNumAllPicCoded ); 169 #endif 144 170 Void preLoopFilterPicAll ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits ); 145 171 … … 185 211 #endif 186 212 #endif 213 #if H_MV 214 Void xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid ); 215 #endif 187 216 #if L0386_DB_METRIC 188 217 Void dblMetric( TComPic* pcPic, UInt uiNumSlices ); -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp
r367 r368 219 219 220 220 // slice type 221 #if H_MV 222 SliceType eSliceTypeBaseView; 223 if( pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0 ) 224 { 225 eSliceTypeBaseView = I_SLICE; 226 } 227 else 228 { 229 eSliceTypeBaseView = B_SLICE; 230 } 231 SliceType eSliceType = eSliceTypeBaseView; 232 if( eSliceTypeBaseView == I_SLICE && m_pcCfg->getGOPEntry(MAX_GOP).m_POC == 0 && m_pcCfg->getGOPEntry(MAX_GOP).m_sliceType != 'I' ) 233 { 234 eSliceType = B_SLICE; 235 } 236 #else 221 237 SliceType eSliceType; 222 238 … … 225 241 226 242 rpcSlice->setSliceType ( eSliceType ); 243 #endif 227 244 228 245 // ------------------------------------------------------------------------------------------------------------------ … … 253 270 if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getSPS()->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) 254 271 { 272 #if H_MV 273 dQP += m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_QPOffset; 274 #else 255 275 dQP += m_pcCfg->getGOPEntry(iGOPid).m_QPOffset; 276 #endif 256 277 } 257 278 } … … 296 317 #endif 297 318 // Case #1: I or P-slices (key-frame) 319 #if H_MV 320 Double dQPFactor; 321 if( eSliceType != I_SLICE ) 322 { 323 dQPFactor = m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_QPFactor; 324 } 325 else 326 #else 298 327 Double dQPFactor = m_pcCfg->getGOPEntry(iGOPid).m_QPFactor; 299 328 if ( eSliceType==I_SLICE ) 329 #endif 300 330 { 301 331 dQPFactor=0.57*dLambda_scale; … … 332 362 if( rpcSlice->getSliceType( ) != I_SLICE ) 333 363 { 364 #if H_MV 365 dLambda *= m_pcCfg->getLambdaModifier( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_temporalId ); 366 #else 334 367 dLambda *= m_pcCfg->getLambdaModifier( m_pcCfg->getGOPEntry(iGOPid).m_temporalId ); 368 #endif 335 369 } 336 370 … … 371 405 #if HB_LAMBDA_FOR_LDC 372 406 // restore original slice type 407 #if H_MV 408 eSliceType = eSliceTypeBaseView; 409 if( eSliceTypeBaseView == I_SLICE && m_pcCfg->getGOPEntry(MAX_GOP).m_POC == 0 && m_pcCfg->getGOPEntry(MAX_GOP).m_sliceType != 'I' ) 410 { 411 eSliceType = B_SLICE; 412 } 413 #else 373 414 eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType; 415 #endif 374 416 375 417 rpcSlice->setSliceType ( eSliceType ); … … 389 431 rpcSlice->setSliceQpDeltaCb ( 0 ); 390 432 rpcSlice->setSliceQpDeltaCr ( 0 ); 433 #if H_MV 434 rpcSlice->setNumRefIdx(REF_PIC_LIST_0,m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_numRefPicsActive); 435 rpcSlice->setNumRefIdx(REF_PIC_LIST_1,m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_numRefPicsActive); 436 #else 391 437 rpcSlice->setNumRefIdx(REF_PIC_LIST_0,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive); 392 438 rpcSlice->setNumRefIdx(REF_PIC_LIST_1,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive); 439 #endif 393 440 394 441 #if L0386_DB_METRIC … … 411 458 if ( !m_pcCfg->getLoopFilterOffsetInPPS() && eSliceType!=I_SLICE) 412 459 { 460 #if H_MV 461 rpcSlice->getPPS()->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() ); 462 rpcSlice->getPPS()->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() ); 463 rpcSlice->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() ); 464 rpcSlice->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() ); 465 #else 413 466 rpcSlice->getPPS()->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() ); 414 467 rpcSlice->getPPS()->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() ); 415 468 rpcSlice->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() ); 416 469 rpcSlice->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() ); 470 #endif 417 471 } 418 472 else … … 435 489 rpcSlice->setDepth ( depth ); 436 490 491 #if H_MV 492 pcPic->setTLayer( m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_temporalId ); 493 #else 437 494 pcPic->setTLayer( m_pcCfg->getGOPEntry(iGOPid).m_temporalId ); 495 #endif 438 496 if(eSliceType==I_SLICE) 439 497 { -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp
r367 r368 42 42 #include "TLibCommon/ContextModel.h" 43 43 #endif 44 #if H_MV 45 #include "../../App/TAppEncoder/TAppEncTop.h" 46 #endif 44 47 45 48 //! \ingroup TLibEncoder … … 78 81 m_pcBitCounters = NULL; 79 82 m_pcRdCosts = NULL; 83 #if H_MV 84 m_ivPicLists = NULL; 85 #endif 80 86 } 81 87 … … 89 95 Void TEncTop::create () 90 96 { 97 #if !H_MV 91 98 // initialize global variables 92 99 initROM(); 100 #endif 93 101 94 102 // create processing unit classes … … 268 276 delete[] m_pcRdCosts; 269 277 278 #if !H_MV 270 279 // destroy ROM 271 280 destroyROM(); 281 #endif 272 282 273 283 return; … … 319 329 // ==================================================================================================================== 320 330 331 #if H_MV 332 Void TEncTop::initNewPic( TComPicYuv* pcPicYuvOrg ) 333 { 334 TComPic* pcPicCurr = NULL; 335 336 // get original YUV 337 xGetNewPicBuffer( pcPicCurr ); 338 pcPicYuvOrg->copyToPic( pcPicCurr->getPicYuvOrg() ); 339 340 // compute image characteristics 341 if ( getUseAdaptiveQP() ) 342 { 343 m_cPreanalyzer.xPreanalyze( dynamic_cast<TEncPic*>( pcPicCurr ) ); 344 } 345 } 346 #endif 321 347 Void TEncTop::deletePicBuffer() 322 348 { … … 345 371 \retval iNumEncoded number of encoded pictures 346 372 */ 373 #if H_MV 374 Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded , Int gopId ) 375 { 376 #else 347 377 Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded ) 348 378 { 379 #endif 380 #if H_3D 381 TComPic* picLastCoded = getPic( getGOPEncoder()->getPocLastCoded() ); 382 if( picLastCoded ) 383 { 384 picLastCoded->compressMotion(); 385 } 386 #endif 387 #if H_MV 388 if( gopId == 0) 389 { 390 m_cGOPEncoder.initGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut); 391 #else 349 392 if (pcPicYuvOrg) { 350 393 // get original YUV … … 365 408 return; 366 409 } 410 #endif 367 411 368 412 #if RATE_CONTROL_LAMBDA_DOMAIN … … 373 417 #endif 374 418 419 #if H_MV 420 } 421 m_cGOPEncoder.compressPicInGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, gopId ); 422 423 if( gopId + 1 == m_cGOPEncoder.getGOPSize() ) 424 { 425 #else 375 426 // compress GOP 376 427 m_cGOPEncoder.compressGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut); 428 #endif 377 429 378 430 #if RATE_CONTROL_LAMBDA_DOMAIN … … 386 438 m_iNumPicRcvd = 0; 387 439 m_uiNumAllPicCoded += iNumEncoded; 440 #if H_MV 441 } 442 #endif 388 443 } 389 444 … … 450 505 Void TEncTop::xInitSPS() 451 506 { 507 #if H_MV 508 m_cSPS.setSPSId( getLayerIdInVps() ); 509 #endif 452 510 ProfileTierLevel& profileTierLevel = *m_cSPS.getPTL()->getGeneralPTL(); 453 511 profileTierLevel.setLevelIdc(m_level); … … 594 652 Void TEncTop::xInitPPS() 595 653 { 654 #if H_MV 655 if( m_cVPS.getNumDirectRefLayers( getLayerIdInVps() ) > 0 ) 656 { 657 m_cPPS.setListsModificationPresentFlag( true ); 658 } 659 m_cPPS.setPPSId( getLayerIdInVps() ); 660 m_cPPS.setSPSId( getLayerIdInVps() ); 661 #endif 596 662 m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred ); 597 663 Bool bUseDQP = (getMaxCuDQPDepth() > 0)? true : false; … … 897 963 Void TEncTop::selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid ) 898 964 { 965 #if H_MV 966 if( slice->getRapPicFlag() == true && getLayerId() > 0 && POCCurr == 0 ) 967 { 968 TComReferencePictureSet* rps = slice->getLocalRPS(); 969 rps->setNumberOfNegativePictures(0); 970 rps->setNumberOfPositivePictures(0); 971 rps->setNumberOfLongtermPictures(0); 972 rps->setNumberOfPictures(0); 973 slice->setRPS(rps); 974 } 975 else 976 { 977 #endif 899 978 slice->setRPSidx(GOPid); 900 979 … … 924 1003 slice->setRPS(getSPS()->getRPSList()->getReferencePictureSet(slice->getRPSidx())); 925 1004 slice->getRPS()->setNumberOfPictures(slice->getRPS()->getNumberOfNegativePictures()+slice->getRPS()->getNumberOfPositivePictures()); 1005 #if H_MV 1006 } 1007 #endif 926 1008 927 1009 } … … 1038 1120 } 1039 1121 } 1122 #if H_MV 1123 Void TEncTop::printSummary( Int numAllPicCoded ) 1124 { 1125 assert (numAllPicCoded == m_cAnalyzeAll.getNumPic()); 1126 1127 //--CFG_KDY 1128 m_cAnalyzeAll.setFrmRate( getFrameRate() ); 1129 m_cAnalyzeI.setFrmRate( getFrameRate() ); 1130 m_cAnalyzeP.setFrmRate( getFrameRate() ); 1131 m_cAnalyzeB.setFrmRate( getFrameRate() ); 1132 1133 //-- all 1134 printf( "\n\nSUMMARY ------------------------------------------- LayerId %2d\n", m_layerId ); 1135 1136 m_cAnalyzeAll.printOut('a'); 1137 1138 printf( "\n\nI Slices--------------------------------------------------------\n" ); 1139 m_cAnalyzeI.printOut('i'); 1140 1141 printf( "\n\nP Slices--------------------------------------------------------\n" ); 1142 m_cAnalyzeP.printOut('p'); 1143 1144 printf( "\n\nB Slices--------------------------------------------------------\n" ); 1145 m_cAnalyzeB.printOut('b'); 1146 1147 #if _SUMMARY_OUT_ 1148 m_cAnalyzeAll.printSummaryOut(); 1149 #endif 1150 #if _SUMMARY_PIC_ 1151 m_cAnalyzeI.printSummary('I'); 1152 m_cAnalyzeP.printSummary('P'); 1153 m_cAnalyzeB.printSummary('B'); 1154 #endif 1155 } 1156 1157 Int TEncTop::getFrameId(Int iGOPid) 1158 { 1159 if(m_iPOCLast == 0) 1160 { 1161 return(0 ); 1162 } 1163 else 1164 { 1165 return m_iPOCLast -m_iNumPicRcvd+ getGOPEntry(iGOPid).m_POC ; 1166 } 1167 } 1168 1169 TComPic* TEncTop::getPic( Int poc ) 1170 { 1171 TComList<TComPic*>* listPic = getListPic(); 1172 TComPic* pcPic = NULL; 1173 for(TComList<TComPic*>::iterator it=listPic->begin(); it!=listPic->end(); it++) 1174 { 1175 if( (*it)->getPOC() == poc ) 1176 { 1177 pcPic = *it ; 1178 break ; 1179 } 1180 } 1181 return pcPic; 1182 } 1183 #endif 1040 1184 //! \} -
branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h
r367 r368 74 74 TComList<TComPic*> m_cListPic; ///< dynamic list of pictures 75 75 76 #if H_MV 77 TComPicLists* m_ivPicLists; ///< access to picture lists of other layers 78 #endif 76 79 // encoder search 77 80 TEncSearch m_cSearch; ///< encoder search class … … 122 125 TEncRateCtrl m_cRateCtrl; ///< Rate control class 123 126 127 #if H_MV 128 TEncAnalyze m_cAnalyzeAll; 129 TEncAnalyze m_cAnalyzeI; 130 TEncAnalyze m_cAnalyzeP; 131 TEncAnalyze m_cAnalyzeB; 132 #endif 124 133 protected: 125 134 Void xGetNewPicBuffer ( TComPic*& rpcPic ); ///< get picture buffer which will be processed … … 137 146 Void destroy (); 138 147 Void init (); 148 #if H_MV 149 TComPicLists* getIvPicLists() { return m_ivPicLists; } 150 #endif 139 151 Void deletePicBuffer (); 140 152 141 153 Void createWPPCoders(Int iNumSubstreams); 142 154 155 #if H_MV 156 Void initNewPic(TComPicYuv* pcPicYuvOrg); 157 #endif 143 158 // ------------------------------------------------------------------------------------------------------------------- 144 159 // member access functions … … 177 192 #endif 178 193 TComScalingList* getScalingList () { return &m_scalingList; } 194 #if H_MV 195 TEncAnalyze* getAnalyzeAll () { return &m_cAnalyzeAll; } 196 TEncAnalyze* getAnalyzeI () { return &m_cAnalyzeI; } 197 TEncAnalyze* getAnalyzeP () { return &m_cAnalyzeP; } 198 TEncAnalyze* getAnalyzeB () { return &m_cAnalyzeB; } 199 200 Int getNumAllPicCoded () { return m_uiNumAllPicCoded; } 201 202 Int getFrameId (Int iGOPid); 203 204 TComPic* getPic ( Int poc ); 205 Void setIvPicLists ( TComPicLists* picLists) { m_ivPicLists = picLists; } 206 #endif 179 207 // ------------------------------------------------------------------------------------------------------------------- 180 208 // encoder function … … 182 210 183 211 /// encode several number of pictures until end-of-sequence 212 #if H_MV 213 Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded , Int gopId ); 214 #else 184 215 Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, 185 216 std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded ); 186 217 #endif 218 219 #if H_MV 220 Void printSummary ( Int numAllPicCoded ); 221 #else 187 222 void printSummary() { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded); } 223 #endif 188 224 }; 189 225
Note: See TracChangeset for help on using the changeset viewer.
