Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecEntropy.cpp
- Timestamp:
- 13 Jul 2015, 15:22:02 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecEntropy.cpp
r1259 r1270 105 105 } 106 106 107 #if H_3D_ARP107 #if NH_3D_ARP 108 108 Void TDecEntropy::decodeARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) 109 109 { … … 257 257 } 258 258 Int numValidMergeCand = 0; 259 #if !NH_3D 259 260 Bool hasMergedCandList = false; 261 #else 262 Bool isMerged = false; 263 #endif 260 264 261 265 pcSubCU->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 ); 262 266 pcSubCU->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 ); 263 #if H_3D267 #if NH_3D 264 268 for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset ) 265 269 { … … 293 297 294 298 ////// Parse CUs extension syntax 299 #if NH_3D_DBBP 295 300 decodeDBBPFlag( pcCU, uiAbsPartIdx, uiDepth ); 296 decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth ); 297 298 #if H_3D_ARP 301 #endif 302 //decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth ); 303 304 #if NH_3D_ARP 299 305 decodeARPW ( pcCU, uiAbsPartIdx, uiDepth ); 300 306 #endif … … 309 315 { 310 316 UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx); 311 #if H_3D_DBBP317 #if NH_3D_DBBP 312 318 if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false ) 313 319 #else … … 327 333 pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand); 328 334 pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours 329 #if H_3D_SPIVMP335 #if NH_3D_SPIVMP 330 336 , pcMvFieldSP, puhInterDirSP 331 337 #endif 332 338 , numValidMergeCand ); 333 339 pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag 334 #if H_3D_SPIVMP340 #if NH_3D_SPIVMP 335 341 , bSPIVMPFlag 336 342 #endif … … 363 369 pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex ); 364 370 pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours 365 #if H_3D_SPIVMP371 #if NH_3D_SPIVMP 366 372 , pcMvFieldSP, puhInterDirSP 367 373 #endif 368 374 ,numValidMergeCand, uiMergeIndex ); 369 375 pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag 370 #if H_3D_SPIVMP376 #if NH_3D_SPIVMP 371 377 , bSPIVMPFlag 372 378 #endif … … 395 401 pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], ePartSize, uiSubPartIdx, uiDepth, uiPartIdx ); 396 402 #if NH_3D_VSP 397 #if H_3D_DBBP403 #if NH_3D_DBBP 398 404 if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 && !pcCU->getDBBPFlag( uiAbsPartIdx ) ) 399 405 #else … … 703 709 } 704 710 705 #if H_3D711 #if NH_3D 706 712 Void TDecEntropy::decodeMVPIdxPU( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList ) 707 713 { … … 1154 1160 } 1155 1161 #endif 1156 #if H_3D_DBBP1162 #if NH_3D_DBBP 1157 1163 Void TDecEntropy::decodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) 1158 1164 {
Note: See TracChangeset for help on using the changeset viewer.