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

Remove stray dos newlines

Browse Source 
These were added in 4ced8a9e and 9645f380.
This commit is contained in:
Martin Storsjö 2014-04-08 11:16:07 +03:00
parent 2ab706a24e
commit d6cb592e83
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1132,7 +1132,7 @@ int32_t CWelsPreProcess::GetRefCandidateLtrIndex(int32_t iRefIdx)
{
const int32_t iTargetDid = m_pEncCtx->pSvcParam->iSpatialLayerNum - 1;
SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (m_pEncCtx->pVaa);
SRefInfoParam* BestRefCandidateParam =&(pVaaExt->sVaaStrBestRefCandidate[iRefIdx]);
SRefInfoParam* BestRefCandidateParam =&(pVaaExt->sVaaStrBestRefCandidate[iRefIdx]);
int32_t iLtrRefIdx = m_pSpatialPic[iTargetDid][BestRefCandidateParam->iSrcListIdx]->iLongTermPicNum;
return iLtrRefIdx;
}

42
codec/processing/src/complexityanalysis/ComplexityAnalysis.h
View File

@ -80,27 +80,27 @@ class CComplexityAnalysis : public IStrategy {
};
//for screen content
class CComplexityAnalysisScreen : public IStrategy
{
public:
CComplexityAnalysisScreen(int32_t cpu_flag);
~CComplexityAnalysisScreen();
EResult Process(int32_t nType, SPixMap *src, SPixMap *ref);
EResult Set(int32_t nType, void *pParam);
EResult Get(int32_t nType, void *pParam);
private:
void GomComplexityAnalysisIntra( SPixMap *pSrc );
void GomComplexityAnalysisInter( SPixMap *pSrc, SPixMap *pRef,bool bScrollFlag);
private:
PSad16x16Func m_pSadFunc;
GetIntraPredPtr m_pIntraFunc[2];
SComplexityAnalysisScreenParam m_ComplexityAnalysisParam;
};
//for screen content
class CComplexityAnalysisScreen : public IStrategy
{
public:
CComplexityAnalysisScreen(int32_t cpu_flag);
~CComplexityAnalysisScreen();
EResult Process(int32_t nType, SPixMap *src, SPixMap *ref);
EResult Set(int32_t nType, void *pParam);
EResult Get(int32_t nType, void *pParam);
private:
void GomComplexityAnalysisIntra( SPixMap *pSrc );
void GomComplexityAnalysisInter( SPixMap *pSrc, SPixMap *pRef,bool bScrollFlag);
private:
PSad16x16Func m_pSadFunc;
GetIntraPredPtr m_pIntraFunc[2];
SComplexityAnalysisScreenParam m_ComplexityAnalysisParam;
};
WELSVP_NAMESPACE_END