generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add back the missing part after merging and formatting

Browse Source
This commit is contained in:
sijchen@cisco.com 2016-06-01 21:33:33 -07:00
parent 8bacc3d4d0
commit a7ae1efc3a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/encoder/core/inc/wels_preprocess.h
View File

@ -227,6 +227,8 @@ class CWelsPreProcessScreen : public CWelsPreProcess {
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);

8
codec/encoder/core/src/wels_preprocess.cpp
View File

@ -588,7 +588,7 @@ ESceneChangeIdc CWelsPreProcessVideo::DetectSceneChange (SPicture* pCurPicture,
}
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 @@ void CWelsPreProcess::InitPixMap (const SPicture* pPicture, SPixMap* pPixMap) {
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 CWelsPreProcessScreen::DetectSceneChange (SPicture* pCurPicture,
}
ESceneChangeIdc iVaaFrameSceneChangeIdc = LARGE_CHANGED_SCENE;
SPicture** pRefPicList = &m_pSpatialPic[iTargetDid][1];
SPicture** pRefPicList = GetReferenceSrcPicList (iTargetDid);
if (NULL == pRefPicList) {
return LARGE_CHANGED_SCENE;
}