diff -Nur 04_TMuC-HHI-RIM2/source//Lib/TLibEncoder/TEncCu.cpp 04_TMuC-HHI-RIM2_earlyskipfix/source//Lib/TLibEncoder/TEncCu.cpp
old
|
new
|
|
373 | 373 | // SKIP |
374 | 374 | pcTempCU = rpcTempCU; |
375 | 375 | |
376 | | #if HHI_MRG |
377 | | if( pcPic->getSlice()->getSPS()->getUseMRG() ) |
378 | | { |
379 | | xCheckRDCostMerge( rpcBestCU, rpcTempCU ); rpcTempCU->initEstData(); |
380 | | } |
381 | | else |
382 | | { |
383 | | xCheckRDCostAMVPSkip ( rpcBestCU, rpcTempCU ); rpcTempCU->initEstData(); |
384 | | } |
385 | | #else |
386 | | xCheckRDCostAMVPSkip ( rpcBestCU, rpcTempCU ); rpcTempCU->initEstData(); |
| 376 | #if HHI_MRG |
| 377 | if( pcPic->getSlice()->getSPS()->getUseMRG() ) |
| 378 | { |
| 379 | xCheckRDCostMerge( rpcBestCU, rpcTempCU ); |
| 380 | rpcTempCU->initEstData(); |
| 381 | } |
| 382 | else |
| 383 | { |
| 384 | xCheckRDCostAMVPSkip ( rpcBestCU, rpcTempCU ); |
| 385 | fRD_Skip = pcTempCU->getTotalCost(); |
| 386 | rpcTempCU->initEstData(); |
| 387 | } |
| 388 | #else |
| 389 | xCheckRDCostAMVPSkip ( rpcBestCU, rpcTempCU ); |
| 390 | fRD_Skip = pcTempCU->getTotalCost(); |
| 391 | rpcTempCU->initEstData(); |
387 | 392 | #endif |
388 | 393 | |
389 | 394 | #if HHI_MRG |