Merge pull request #1829 from syureyi/wp_p

Decoder WP support

dongzha committed 11 years ago

Commit 5b125782 parents 5a1aedb 9ef0c746 files · +229 −5Browse files

Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 6 files). Show all

Unified · Split

codec/decoder/core/src/au_parser.cpp+3−3

@@ -1353,10 +1353,10 @@ int32_t ParsePps (PWelsDecoderContext pCtx, PPps pPpsList, PBitStringAux pBsAux, · 1352 unmodified lines
1353	1353	pPps->bWeightedPredFlag = !!uiCode;
1354	1354	WELS_READ_VERIFY (BsGetBits (pBsAux, 2, &uiCode)); //weighted_bipred_idc
1355	1355	pPps->uiWeightedBipredIdc = uiCode;
1356		− if (pPps->bWeightedPredFlag \|\| pPps->uiWeightedBipredIdc != 0) {
	1356	+ if (pPps->uiWeightedBipredIdc != 0) {
1357	1357	WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
1358		− "ParsePps(): weighted_pred_flag (%d) weighted_bipred_idc (%d) neither supported.\n",
1359		− pPps->bWeightedPredFlag, pPps->uiWeightedBipredIdc);
	1358	+ "ParsePps(): weighted_bipred_idc (%d) not supported.\n",
	1359	+ pPps->uiWeightedBipredIdc);
1360	1360	return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_WP);
1361	1361	}
1362	1362