Changeset 683 in SHVCSoftware
- Timestamp:
- 16 Apr 2014, 01:40:04 (11 years ago)
- Location:
- branches/SHM-6-dev/source/Lib
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h ¶
r677 r683 86 86 #define O0194_JOINT_US_BITSHIFT 1 ///< JCTVC-O0194: Joint Upsampling and bit-shift 87 87 #endif 88 #define Q0048_CGS_3D_ASYMLUT 88 #define Q0048_CGS_3D_ASYMLUT 1 89 89 #if Q0048_CGS_3D_ASYMLUT 90 #define Q0048_CGS_3D_ASYMLUT_OFF 091 #define Q0048_CGS_3D_ASYMLUT_PPSUPDATE 192 90 #define O0194_WEIGHTED_PREDICTION_CGS 0 93 91 #else -
TabularUnified branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶
r677 r683 358 358 READ_FLAG( uiCode , "colour_mapping_enabled_flag" ); 359 359 pcPPS->setCGSFlag( uiCode ); 360 if( pcPPS->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE)360 if( pcPPS->getCGSFlag() ) 361 361 { 362 362 xParse3DAsymLUT( pc3DAsymLUT ); -
TabularUnified branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp ¶
r677 r683 1550 1550 #if Q0048_CGS_3D_ASYMLUT 1551 1551 TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(); 1552 if( pcSlice->getPPS()->getCGSFlag() != Q0048_CGS_3D_ASYMLUT_OFF)1552 if( pcSlice->getPPS()->getCGSFlag() ) 1553 1553 { 1554 1554 if(!m_pColorMappedPic) -
TabularUnified branches/SHM-6-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp ¶
r678 r683 390 390 if( pSlice->getBaseColPic( pSlice->getInterLayerPredLayerIdc( 0 ) )->getSlice( 0 )->isIntra() ) 391 391 nPartNumLog2 = xGetMaxPartNumLog2(); 392 if( m_nPrevFrameBit[nSliceType][nSliceTempLevel] && pSlice->getPPS()->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE)392 if( m_nPrevFrameBit[nSliceType][nSliceTempLevel] && pSlice->getPPS()->getCGSFlag() ) 393 393 { 394 394 Double dBitCost = 1.0 * m_nPrevFrameCGSBit[nSliceType][nSliceTempLevel] / m_nPrevFrameBit[nSliceType][nSliceTempLevel]; -
TabularUnified branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp ¶
r677 r683 275 275 UInt uiPos = getNumberOfWrittenBits(); 276 276 WRITE_FLAG( pcPPS->getCGSFlag() , "colour_mapping_enabled_flag" ); 277 if( pcPPS->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE)277 if( pcPPS->getCGSFlag() ) 278 278 { 279 279 assert( pc3DAsymLUT != NULL ); -
TabularUnified branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp ¶
r678 r683 955 955 #if Q0048_CGS_3D_ASYMLUT 956 956 TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(); 957 if( pcSlice->getPPS()->getCGSFlag() != Q0048_CGS_3D_ASYMLUT_OFF)957 if( pcSlice->getPPS()->getCGSFlag() ) 958 958 { 959 959 if(g_posScalingFactor[refLayerIdc][0] < (1<<16) || g_posScalingFactor[refLayerIdc][1] < (1<<16)) //if(pcPic->isSpatialEnhLayer(refLayerIdc)) … … 1996 1996 } 1997 1997 #if Q0048_CGS_3D_ASYMLUT 1998 else if( m_pcCfg->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE&& pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() )1998 else if( m_pcCfg->getCGSFlag() && pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() ) 1999 1999 { 2000 2000 #if SVC_EXTENSION … … 4153 4153 pSlice->setCGSOverWritePPS( 1 ); // regular PPS update 4154 4154 } 4155 else if( nCGSFlag == Q0048_CGS_3D_ASYMLUT_PPSUPDATE)4155 else if( nCGSFlag ) 4156 4156 { 4157 4157 dErrorPPS = m_Enc3DAsymLUTPPS.estimateDistWithCur3DAsymLUT( pCurPic , refLayerIdc );
Note: See TracChangeset for help on using the changeset viewer.