Changeset 116 in 3DVCSoftware for trunk/source/Lib/TLibCommon
- Timestamp:
- 30 Aug 2012, 16:09:23 (12 years ago)
- Location:
- trunk/source/Lib/TLibCommon
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibCommon/TComDataCU.cpp
r115 r116 152 152 #endif 153 153 #endif 154 #if OL_DEPTHLIMIT 154 #if OL_DEPTHLIMIT_A0044 155 155 //add a variable to store the partition information 156 //a 2D array in part_symbol, uidepth format156 //a 2D array in part_symbol, uidepth format 157 157 //initialize m_partInfo to OL_END_CU 158 for (int i=0; i < OL_PART_BUF_SIZE; i++) 159 { 160 for (int j=0; j < 2; j++) 161 m_uiPartInfo[i][j] = OL_END_CU; 162 } 158 for (Int i=0; i < OL_PART_BUF_SIZE; i++) 159 { 160 for (Int j=0; j < 2; j++) 161 { 162 m_uiPartInfo[i][j] = OL_END_CU; 163 } 164 } 163 165 #endif 164 166 } … … 466 468 Void TComDataCU::initCU( TComPic* pcPic, UInt iCUAddr ) 467 469 { 468 #if OL_DEPTHLIMIT 470 #if OL_DEPTHLIMIT_A0044 469 471 TComDataCU* pcCU = pcPic->getCU(iCUAddr); 470 472 #endif … … 685 687 m_apcCUColocated[1] = getSlice()->getRefPic( REF_PIC_LIST_1, 0)->getCU( m_uiCUAddr ); 686 688 } 687 #if OL_DEPTHLIMIT 689 #if OL_DEPTHLIMIT_A0044 688 690 setPartDumpFlag (pcCU->getPartDumpFlag()); 689 691 #endif … … 1017 1019 memcpy(m_uiSliceStartCU,pcCU->m_uiSliceStartCU+uiPartOffset,sizeof(UInt)*m_uiNumPartition); 1018 1020 memcpy(m_uiEntropySliceStartCU,pcCU->m_uiEntropySliceStartCU+uiPartOffset,sizeof(UInt)*m_uiNumPartition); 1019 #if OL_DEPTHLIMIT 1021 #if OL_DEPTHLIMIT_A0044 1020 1022 setPartDumpFlag (pcCU->getPartDumpFlag()); 1021 1023 #endif -
trunk/source/Lib/TLibCommon/TComDataCU.h
r115 r116 238 238 UInt* m_uiEntropySliceStartCU; ///< Start CU address of current slice 239 239 240 #if OL_DEPTHLIMIT 240 #if OL_DEPTHLIMIT_A0044 241 241 //add a variable to store the partition information 242 //a 2D array in uidepth, part_symbol format242 //a 2D array in uidepth, part_symbol format 243 243 UInt m_uiPartInfo[OL_PART_BUF_SIZE][2]; 244 244 UInt m_uiPartNum; 245 Bool 245 Bool b_dumpPartInfo; 246 246 #endif 247 247 … … 605 605 Void compressMV (); 606 606 607 #if OL_DEPTHLIMIT 608 Void resetPartInfo () {m_uiPartNum = 0;}; 609 Void incrementPartInfo () {m_uiPartNum ++;}; 610 Void updatePartInfo(UInt uiSymbol, UInt uiDepth) {m_uiPartInfo[m_uiPartNum][0] = uiSymbol; m_uiPartInfo 611 [m_uiPartNum][1] = uiDepth;}; 612 UInt* readPartInfo() {return (UInt*)m_uiPartInfo;}; 613 // UInt getPartNumIdx() {return m_uiPartNum;}; //added this to get the index 614 //flag to signal to start dumping 615 Void setPartDumpFlag(bool flag) {b_dumpPartInfo = flag;}; 616 Bool getPartDumpFlag() {return b_dumpPartInfo;}; 607 #if OL_DEPTHLIMIT_A0044 608 Void resetPartInfo () {m_uiPartNum = 0;}; 609 Void incrementPartInfo () {m_uiPartNum ++;}; 610 Void updatePartInfo(UInt uiSymbol, UInt uiDepth) { m_uiPartInfo[m_uiPartNum][0] = uiSymbol; m_uiPartInfo[m_uiPartNum][1] = uiDepth;}; 611 UInt* readPartInfo() { return (UInt*)m_uiPartInfo;}; 612 Void setPartDumpFlag(Bool flag) { b_dumpPartInfo = flag; }; 613 Bool getPartDumpFlag() { return b_dumpPartInfo; }; 617 614 #endif 618 615 -
trunk/source/Lib/TLibCommon/TComRdCost.h
r115 r116 378 378 #endif 379 379 #if LGE_WVSO_A0119 380 Int 381 Int 380 Int m_iDWeight; 381 Int m_iVSOWeight; 382 382 Int m_iVSDWeight; 383 383 Bool m_bWVSO; … … 417 417 UInt getVSOMode( ) { return m_uiVSOMode; } 418 418 #if LGE_WVSO_A0119 419 Void setWVSO ( Bool bIn ) { m_bWVSO = bIn; };420 Bool getWVSO ( ) { return m_bWVSO;};421 Void setDWeight ( Int iDWeight ){ m_iDWeight = iDWeight; };422 Int getDWeight (){ return m_iDWeight; };423 Void 424 Int getVSOWeight (){ return m_iVSOWeight; };425 Void 426 Int getVSDWeight (){ return m_iVSDWeight; };419 Void setWVSO ( Bool bIn ) { m_bWVSO = bIn; }; 420 Bool getWVSO ( ) { return m_bWVSO;}; 421 Void setDWeight ( Int iDWeight ) { m_iDWeight = iDWeight; }; 422 Int getDWeight () { return m_iDWeight; }; 423 Void setVSOWeight ( Int iVSOWeight ) { m_iVSOWeight = iVSOWeight; }; 424 Int getVSOWeight () { return m_iVSOWeight; }; 425 Void setVSDWeight ( Int iVSDWeight ) { m_iVSDWeight = iVSDWeight; }; 426 Int getVSDWeight () { return m_iVSDWeight; }; 427 427 #endif 428 428 #if HHI_VSO_DIST_INT -
trunk/source/Lib/TLibCommon/TComSlice.cpp
r115 r116 1441 1441 , m_bUseDMM (false) 1442 1442 #endif 1443 #if OL_DEPTHLIMIT 1443 #if OL_DEPTHLIMIT_A0044 1444 1444 , m_bDepthPartitionLimiting (false) 1445 1445 #endif -
trunk/source/Lib/TLibCommon/TComSlice.h
r115 r116 354 354 #endif 355 355 356 #if OL_DEPTHLIMIT 356 #if OL_DEPTHLIMIT_A0044 357 357 Bool m_bDepthPartitionLimiting; 358 358 #endif … … 623 623 #endif 624 624 625 #if OL_DEPTHLIMIT 625 #if OL_DEPTHLIMIT_A0044 626 626 Void setUseDPL(Bool b) {m_bDepthPartitionLimiting = b; } 627 627 Bool getUseDPL() {return m_bDepthPartitionLimiting;} -
trunk/source/Lib/TLibCommon/TComWedgelet.h
r56 r116 198 198 static UInt xGetSAD16 ( WedgeDistParam* pcDtParam ); 199 199 static UInt xGetSAD32 ( WedgeDistParam* pcDtParam ); 200 //static UInt xGetSAD64 ( WedgeDistParam* pcDtParam );201 200 202 201 static UInt xGetSSE4 ( WedgeDistParam* pcDtParam ); … … 204 203 static UInt xGetSSE16 ( WedgeDistParam* pcDtParam ); 205 204 static UInt xGetSSE32 ( WedgeDistParam* pcDtParam ); 206 //static UInt xGetSSE64 ( WedgeDistParam* pcDtParam );207 205 208 206 };// END CLASS DEFINITION TComWedgeDist -
trunk/source/Lib/TLibCommon/TypeDef.h
r115 r116 96 96 #define LGE_WVSO_A0119 1 // JCT2-A0119 Depth Metric with a weighted depth fidelity term 97 97 98 #define OL_DEPTHLIMIT 99 #if OL_DEPTHLIMIT 98 #define OL_DEPTHLIMIT_A0044 1 //JCT2-A0044 99 #if OL_DEPTHLIMIT_A0044 100 100 #define OL_DO_NOT_LIMIT_INTRA_SLICES_PART 1 //Turn this on to not perform depth limiting for I-SLICES. 101 #define OL_END_CU MAX_INT //Default for initiali sing the partition information buffer101 #define OL_END_CU MAX_INT //Default for initializing the partition information buffer 102 102 #define OL_PART_BUF_SIZE 86 //maximum number of possible partition bits in a CU 103 103 #endif
Note: See TracChangeset for help on using the changeset viewer.