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

Merge pull request #1668 from mstorsjo/fix-warnings

Browse Source 
Fix build warnings with GCC
This commit is contained in:
ruil2 2014-12-24 09:09:29 +08:00
commit bd50f64152
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/decoder/core/src/au_parser.cpp
View File

@ -1437,7 +1437,7 @@ int32_t ParseScalingList (PSps pSps, PBitStringAux pBs, bool bPPS, bool* pScalin
defaultScaling[2] = bInit ? pSps->iScalingList8x8[0] : g_kuiDequantScaling8x8Default[0]; defaultScaling[2] = bInit ? pSps->iScalingList8x8[0] : g_kuiDequantScaling8x8Default[0];
defaultScaling[3] = bInit ? pSps->iScalingList8x8[1] : g_kuiDequantScaling8x8Default[1]; defaultScaling[3] = bInit ? pSps->iScalingList8x8[1] : g_kuiDequantScaling8x8Default[1];
for (int i = 0; i < uiScalingListNum; i++) { for (unsigned int i = 0; i < uiScalingListNum; i++) {
WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));
pScalingListPresentFlag[i] = !!uiCode; pScalingListPresentFlag[i] = !!uiCode;
if (!!uiCode) { if (!!uiCode) {

2
codec/decoder/core/src/decode_slice.cpp
View File

@ -921,10 +921,8 @@ int32_t WelsDecodeMbCabacPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uin
} }
// Calculate deqaunt coeff scaling list value // Calculate deqaunt coeff scaling list value
int32_t WelsCalcDeqCoeffScalingList (PWelsDecoderContext pCtx) { int32_t WelsCalcDeqCoeffScalingList (PWelsDecoderContext pCtx) {
int32_t iScalingListNum = 0;
if (pCtx->pSps->bSeqScalingMatrixPresentFlag || pCtx->pPps->bPicScalingMatrixPresentFlag) { if (pCtx->pSps->bSeqScalingMatrixPresentFlag || pCtx->pPps->bPicScalingMatrixPresentFlag) {
pCtx->bUseScalingList = true; pCtx->bUseScalingList = true;
iScalingListNum = (pCtx->pSps->uiChromaFormatIdc != 3) ? 8 : 12;
if (!pCtx->bDequantCoeff4x4Init || (pCtx->iDequantCoeffPpsid != pCtx->pPps->iPpsId)) { if (!pCtx->bDequantCoeff4x4Init || (pCtx->iDequantCoeffPpsid != pCtx->pPps->iPpsId)) {
int i, q, x; int i, q, x;

2
codec/decoder/core/src/parse_mb_syn_cabac.cpp
View File

@ -825,7 +825,7 @@ int32_t ParseResidualBlockCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroC
uint32_t uiCbpBit; uint32_t uiCbpBit;
int32_t pSignificantMap[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; int32_t pSignificantMap[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
int32_t iMbResProperty; int32_t iMbResProperty = 0;
GetMbResProperty (&iMbResProperty, &iResProperty, false); GetMbResProperty (&iMbResProperty, &iResProperty, false);
const uint16_t* pDeQuantMul = (pCtx->bUseScalingList) ? pCtx->pDequant_coeff4x4[iMbResProperty][uiQp] : const uint16_t* pDeQuantMul = (pCtx->bUseScalingList) ? pCtx->pDequant_coeff4x4[iMbResProperty][uiQp] :
g_kuiDequantCoeff[uiQp]; g_kuiDequantCoeff[uiQp];