Changeset 878 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibCommon
- Timestamp:
- 27 Mar 2014, 19:51:52 (11 years ago)
- Location:
- branches/HTM-10.1-dev0/source/Lib/TLibCommon
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-10.1-dev0/source/Lib/TLibCommon/ContextTables.h
r877 r878 104 104 105 105 #if H_3D_DIM 106 #if QC_GENERIC_SDC_G0122107 106 #define NUM_DEPTH_INTRA_MODE_CTX 1 ///< number of context models for depth intra modes 108 #else109 #define NUM_DEPTH_INTRA_MODE_CTX 8 ///< number of context models for depth intra modes110 #endif111 107 #define NUM_DDC_FLAG_CTX 2 ///< number of context models for deltaDC flag (DMM or RBC) 112 108 #define NUM_DDC_DATA_CTX 1 ///< number of context models for deltaDC data (DMM or RBC) … … 114 110 #define NUM_DMM1_DATA_CTX 1 ///< number of context models for DMM1 data 115 111 #endif 116 #if QC_GENERIC_SDC_G0122117 112 #define NUM_ANGLE_FLAG_CTX 3 118 #endif119 113 #endif 120 114 … … 366 360 #endif 367 361 #if H_3D_DIM 368 #if QC_GENERIC_SDC_G0122369 362 static const UChar 370 363 INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] = … … 374 367 { 154, } 375 368 }; 376 #else 377 static const UChar 378 INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] = 379 { 380 {0, 0, 64, 168, 168, 124, CNU, 0}, 381 {0, 64, 0, 183, CNU, 108, 0, 0}, 382 {64, 0, CNU, CNU, 168, 109, 0, 0} 383 }; 384 #endif 385 386 #if QC_GENERIC_SDC_G0122 369 387 370 static const UChar 388 371 INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] = … … 392 375 { 155, 170, 157 }, 393 376 }; 394 #endif395 377 396 378 static const UChar -
branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp
r877 r878 2375 2375 #endif 2376 2376 2377 #if QC_GENERIC_SDC_G01222377 #if H_3D_DIM_SDC 2378 2378 UInt TComDataCU::getCtxSDCFlag( UInt uiAbsPartIdx ) 2379 2379 { … … 2624 2624 // check general CU information 2625 2625 if( !getSlice()->getIsDepth() || !isIntra(uiAbsPartIdx) || getPartitionSize(uiAbsPartIdx) != SIZE_2Nx2N ) 2626 { 2626 2627 return false; 2627 #if QC_GENERIC_SDC_G0122 2628 } 2629 2628 2630 if( isDimMode( getLumaIntraDir( uiAbsPartIdx ) ) && !isDimDeltaDC( getLumaIntraDir( uiAbsPartIdx ) ) ) 2629 2631 { … … 2637 2639 2638 2640 return false; 2639 #endif2640 2641 // check prediction mode 2641 2642 UInt uiLumaPredMode = getLumaIntraDir( uiAbsPartIdx ); -
branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComDataCU.h
r877 r878 556 556 Pel getSDCSegmentDCOffset( UInt uiSeg, UInt uiPartIdx ) { return m_apSegmentDCOffset[uiSeg][uiPartIdx]; } 557 557 Void setSDCSegmentDCOffset( Pel pOffset, UInt uiSeg, UInt uiPartIdx) { m_apSegmentDCOffset[uiSeg][uiPartIdx] = pOffset; } 558 #if QC_GENERIC_SDC_G0122559 558 UInt getCtxSDCFlag ( UInt uiAbsPartIdx ); 560 559 UInt getCtxAngleFlag ( UInt uiAbsPartIdx ); 561 #endif562 560 #endif 563 561 #endif -
branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComPrediction.cpp
r872 r878 416 416 417 417 #if H_3D_DIM 418 Void TComPrediction::predIntraLumaDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc 419 #if QC_GENERIC_SDC_G0122 420 , TComWedgelet* dmm4Segmentation 421 #endif 422 ) 418 Void TComPrediction::predIntraLumaDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc, TComWedgelet* dmm4Segmentation ) 423 419 { 424 420 assert( iWidth == iHeight ); … … 446 442 case( DMM4_IDX ): 447 443 { 448 #if QC_GENERIC_SDC_G0122449 444 if( dmm4Segmentation == NULL ) 450 445 { … … 457 452 dmmSegmentation = dmm4Segmentation; 458 453 } 459 #else460 dmmSegmentation = new TComWedgelet( iWidth, iHeight );461 xPredContourFromTex( pcCU, uiAbsPartIdx, iWidth, iHeight, dmmSegmentation );462 #endif463 454 } break; 464 455 default: assert(0); … … 511 502 512 503 #if H_3D_DIM_DMM 513 #if QC_GENERIC_SDC_G0122514 504 if( dimType == DMM4_IDX && dmm4Segmentation == NULL ) { dmmSegmentation->destroy(); delete dmmSegmentation; } 515 #else516 if( dimType == DMM4_IDX ) { dmmSegmentation->destroy(); delete dmmSegmentation; }517 #endif518 505 #endif 519 506 } … … 2593 2580 Int iSumPix[2]; 2594 2581 memset(iSumPix, 0, sizeof(Int)*2); 2595 #if QC_GENERIC_SDC_G01222596 2582 for( Int i = 0; i < uiNumSegments; i++ ) 2597 2583 { 2598 2584 rpSegMeans[i] = 0; 2599 2585 } 2600 #endif2601 2586 if (orgDC == false) 2602 2587 { … … 2613 2598 rpSegMeans[ucSegmentRB] = pOrig[uiStride * (uiSize-1) + (uiSize-1) ]; 2614 2599 } 2615 #if QC_GENERIC_SDC_G01222616 2600 else if( getDimType( uiIntraMode ) == DMM4_IDX ) 2617 2601 { … … 2647 2631 } 2648 2632 else 2649 #else2650 else if (uiIntraMode == PLANAR_IDX)2651 #endif2652 2633 { 2653 2634 Pel* pLeftTop = pOrig; -
branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComPrediction.h
r872 r878 172 172 // Depth intra 173 173 Void predIntraLumaDepth ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc = false 174 #if QC_GENERIC_SDC_G0122175 174 , TComWedgelet* dmm4Segmentation = NULL 176 #endif177 175 ); 178 176 #if H_3D_DIM_SDC -
branches/HTM-10.1-dev0/source/Lib/TLibCommon/TypeDef.h
r877 r878 184 184 // QC_DIM_DELTADC_UNIFY_F0132 Unify delta DC coding in depth intra modes 185 185 // Unify intra SDC and inter SDC 186 // QC_GENERIC_SDC_G0122 Generalize SDC to all depth intra modes 186 187 187 188 … … 317 318 #endif 318 319 #define SCU_HS_DEPTH_DC_PRED_G0143 1 319 #define QC_GENERIC_SDC_G0122 1 // Generalize SDC to all depth intra modes 320 320 321 #endif 321 322
Note: See TracChangeset for help on using the changeset viewer.