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

Merge pull request #986 from ruil2/rename

Browse Source 
rename some varialbes
This commit is contained in:
dongzha 2014-06-20 10:00:37 +08:00
commit 2f012f6e07
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/api/svc/codec_app_def.h
View File

@ -389,12 +389,12 @@ typedef struct Source_Picture_s {
long long uiTimeStamp; long long uiTimeStamp;
} SSourcePicture; } SSourcePicture;
typedef struct Bitrate_Info_s { typedef struct TagBitrateInfo {
LAYER_NUM iLayer; LAYER_NUM iLayer;
int iBitrate; //the maximum bitrate int iBitrate; //the maximum bitrate
} SBitrateInfo; } SBitrateInfo;
typedef struct Dump_Layer_s { typedef struct TagDumpLayer {
int iLayer; int iLayer;
char* pFileName; char* pFileName;
} SDumpLayer; } SDumpLayer;

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

@ -255,24 +255,24 @@ int32_t CWelsPreProcess::AnalyzeSpatialPic (sWelsEncCtx* pCtx, const int32_t kiD
} }
int32_t CWelsPreProcess::UpdateSpatialPictures (sWelsEncCtx* pCtx, SWelsSvcCodingParam* pParam, int32_t CWelsPreProcess::UpdateSpatialPictures (sWelsEncCtx* pCtx, SWelsSvcCodingParam* pParam,
const int8_t iCurTid, const int32_t d_idx) { const int8_t iCurTid, const int32_t kiDidx) {
if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME)
return 0; return 0;
if (iCurTid < m_uiSpatialLayersInTemporal[d_idx] - 1 || pParam->iDecompStages == 0) { if (iCurTid < m_uiSpatialLayersInTemporal[kiDidx] - 1 || pParam->iDecompStages == 0) {
if ((iCurTid >= MAX_TEMPORAL_LEVEL) || (m_uiSpatialLayersInTemporal[d_idx] - 1 > MAX_TEMPORAL_LEVEL)) { if ((iCurTid >= MAX_TEMPORAL_LEVEL) || (m_uiSpatialLayersInTemporal[kiDidx] - 1 > MAX_TEMPORAL_LEVEL)) {
InitLastSpatialPictures (pCtx); InitLastSpatialPictures (pCtx);
return 1; return 1;
} }
if (pParam->bEnableLongTermReference && pCtx->bLongTermRefFlag[d_idx][iCurTid]) { if (pParam->bEnableLongTermReference && pCtx->bLongTermRefFlag[kiDidx][iCurTid]) {
SPicture* tmp = m_pSpatialPic[d_idx][m_uiSpatialLayersInTemporal[d_idx] + pCtx->pVaa->uiMarkLongTermPicIdx]; SPicture* tmp = m_pSpatialPic[kiDidx][m_uiSpatialLayersInTemporal[kiDidx] + pCtx->pVaa->uiMarkLongTermPicIdx];
m_pSpatialPic[d_idx][m_uiSpatialLayersInTemporal[d_idx] + pCtx->pVaa->uiMarkLongTermPicIdx] = m_pSpatialPic[kiDidx][m_uiSpatialLayersInTemporal[kiDidx] + pCtx->pVaa->uiMarkLongTermPicIdx] =
m_pSpatialPic[d_idx][iCurTid]; m_pSpatialPic[kiDidx][iCurTid];
m_pSpatialPic[d_idx][iCurTid] = m_pSpatialPic[d_idx][m_uiSpatialLayersInTemporal[d_idx] - 1]; m_pSpatialPic[kiDidx][iCurTid] = m_pSpatialPic[kiDidx][m_uiSpatialLayersInTemporal[kiDidx] - 1];
m_pSpatialPic[d_idx][m_uiSpatialLayersInTemporal[d_idx] - 1] = tmp; m_pSpatialPic[kiDidx][m_uiSpatialLayersInTemporal[kiDidx] - 1] = tmp;
pCtx->bLongTermRefFlag[d_idx][iCurTid] = false; pCtx->bLongTermRefFlag[kiDidx][iCurTid] = false;
} else { } else {
WelsExchangeSpatialPictures (&m_pSpatialPic[d_idx][m_uiSpatialLayersInTemporal[d_idx] - 1], WelsExchangeSpatialPictures (&m_pSpatialPic[kiDidx][m_uiSpatialLayersInTemporal[kiDidx] - 1],
&m_pSpatialPic[d_idx][iCurTid]); &m_pSpatialPic[kiDidx][iCurTid]);
} }
} }
return 0; return 0;