shithub: openh264

Download patch

ref: a7ae1efc3ac296456285137b2817cb66a2c2e57f
parent: 8bacc3d4d066d8453e4169171289b0a14828b7fd
author: sijchen@cisco.com <sijchen@cisco.com>
date: Wed Jun 1 17:33:33 EDT 2016 

add back the missing part after merging and formatting


--- a/codec/encoder/core/inc/wels_preprocess.h
+++ b/codec/encoder/core/inc/wels_preprocess.h
@@ -227,6 +227,8 @@
   virtual ESceneChangeIdc  DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture = NULL);
 
  private:
+  SPicture** GetReferenceSrcPicList(int32_t iTargetDid);
+
   void GetAvailableRefListLosslessScreenRefSelection (SPicture** pSrcPicList, uint8_t iCurTid,
       const int32_t iClosestLtrFrameNum,
       SRefInfoParam* pAvailableRefList, int32_t& iAvailableRefNum, int32_t& iAvailableSceneRefNum);
--- a/codec/encoder/core/src/wels_preprocess.cpp
+++ b/codec/encoder/core/src/wels_preprocess.cpp
@@ -588,7 +588,7 @@
 }
 
 SPicture* CWelsPreProcessVideo::GetCurrentOrigFrame (int32_t iDIdx) {
-  return m_pSpatialPic[iDIdx][GetCurPicPosition(iDIdx)];
+  return m_pSpatialPic[iDIdx][GetCurPicPosition (iDIdx)];
 }
 
 int32_t CWelsPreProcess::DownsamplePadding (SPicture* pSrc, SPicture* pDstPic,  int32_t iSrcWidth, int32_t iSrcHeight,
@@ -930,6 +930,10 @@
   pPixMap->eFormat = VIDEO_FORMAT_I420;
 }
 
+SPicture** CWelsPreProcessScreen::GetReferenceSrcPicList (int32_t iTargetDid) {
+  return (&m_pSpatialPic[iTargetDid][1]);
+}
+
 void CWelsPreProcessScreen::GetAvailableRefListLosslessScreenRefSelection (SPicture** pRefPicList, uint8_t iCurTid,
     const int32_t iClosestLtrFrameNum,
     SRefInfoParam* pAvailableRefParam, int32_t& iAvailableRefNum, int32_t& iAvailableSceneRefNum) {
@@ -1064,7 +1068,7 @@
   }
 
   ESceneChangeIdc iVaaFrameSceneChangeIdc = LARGE_CHANGED_SCENE;
-  SPicture** pRefPicList = &m_pSpatialPic[iTargetDid][1];
+  SPicture** pRefPicList = GetReferenceSrcPicList (iTargetDid);
   if (NULL == pRefPicList) {
     return LARGE_CHANGED_SCENE;
   }