shithub: openh264

Download patch

ref: 747e88a985361818e563f5cf90d4f19aa7bd1454
parent: ca3a6dc4b6e16008519a136379ec72c702a088ba
parent: 7642b5f5fc54adf1732d5d83d43a6f3c1296e203
author: Licai Guo <licaguo@cisco.com>
date: Tue Mar 25 02:44:58 EDT 2014 

Merge pull request #566 from volvet/develop_b

use overwrite for scene change detector


--- a/codec/processing/src/scenechangedetection/SceneChangeDetection.h
+++ b/codec/processing/src/scenechangedetection/SceneChangeDetection.h
@@ -72,7 +72,7 @@
   }
   virtual ~CSceneChangeDetectorVideo() {
   }
-  virtual void operator () (uint8_t* pSrcY, int32_t iSrcStrideY, uint8_t* pRefY, int32_t iRefStrideY, uint8_t *& pStaticBlockIdc) {
+  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);
     m_sParam.iMotionBlockNum += iSad > HIGH_MOTION_BLOCK_THRESHOLD;
   }
@@ -87,7 +87,7 @@
   }
   virtual ~CSceneChangeDetectorScreen() {
   }
-  virtual void operator() (uint8_t* pSrcY, int32_t iSrcStrideY, uint8_t* pRefY, int32_t iRefStrideY, uint8_t *& pStaticBlockIdc) {
+  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;