Changeset 486 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp
- Timestamp:
- 16 Nov 2013, 03:01:57 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-4.0-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp
r473 r486 258 258 refDC <<= (g_bitDepthYLayer[1]-g_bitDepthYLayer[0]); 259 259 #endif 260 260 } 261 261 #endif 262 262 … … 266 266 Int offset = (Int)( ((currDC<<log2Denom) - ((Int64)weight * refDC) + (Int64)realOffset) >> realLog2Denom ); 267 267 #if O0194_WEIGHTED_PREDICTION_CGS 268 if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId())){ 269 } 270 else{ 268 if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId())) 269 { 270 } 271 else 272 { 271 273 dWeight = 1; 272 274 offset = 0; … … 295 297 #if O0194_WEIGHTED_PREDICTION_CGS 296 298 // make sure the reference frames other than ILR are not using weighted prediction 297 if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))){ 299 if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))) 300 { 298 301 continue; 299 302 }
Note: See TracChangeset for help on using the changeset viewer.