ref: b7541449d39577156e06712e6821e3539b985059
parent: 4e52887eec489e50e3f9b8195c241a7d0a958c83
parent: 33d20528565fd3e36fbbe1d02fed0bbfd990b55b
author: sijchen <[email protected]>
date: Fri Apr 4 04:58:50 EDT 2014
Merge pull request #626 from volvet/fix_scd_screen fix static block assign in scd screen
--- a/codec/processing/src/scenechangedetection/SceneChangeDetection.h
+++ b/codec/processing/src/scenechangedetection/SceneChangeDetection.h
@@ -90,11 +90,11 @@
void operator() (uint8_t* pSrcY, int32_t iSrcStrideY, uint8_t* pRefY, int32_t iRefStrideY, uint8_t *& pStaticBlockIdc) {
int32_t iSad = m_pfSad(pSrcY, iSrcStrideY, pRefY, iSrcStrideY);
if( iSad == 0 ){
- *pStaticBlockIdc ++ = NO_STATIC;
+ *pStaticBlockIdc ++ = COLLOCATED_STATIC;
} else {
m_sParam.iFrameComplexity += iSad;
m_sParam.iMotionBlockNum += iSad > HIGH_MOTION_BLOCK_THRESHOLD;
- *pStaticBlockIdc ++ = COLLOCATED_STATIC;
+ *pStaticBlockIdc ++ = NO_STATIC;
}
}
};