History

Merge pull request #1812 from huili2/cropping_error

return error for cropping data error

HaiboZhu committed 11 years ago

Commit 1641ce92 parents a73c1e6 56833932 files · +5 −2Browse files

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

Unified · Split

codec/decoder/core/src/au_parser.cpp+4−2
@@ -1081,14 +1081,16 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 1080 unmodified lines
10811081 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_right_offset
10821082 pSps->sFrameCrop.iRightOffset = uiCode;
10831083 if ((pSps->sFrameCrop.iLeftOffset + pSps->sFrameCrop.iRightOffset) > ((int32_t)pSps->iMbWidth * 16 / 2)) {
1084− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "frame_crop_left_offset + frame_crop_right_offset exceeds limits!");
1084+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "frame_crop_left_offset + frame_crop_right_offset exceeds limits!");
1085+ return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_CROPPING_DATA);
10851086 }
10861087 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_top_offset
10871088 pSps->sFrameCrop.iTopOffset = uiCode;
10881089 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_bottom_offset
10891090 pSps->sFrameCrop.iBottomOffset = uiCode;
10901091 if ((pSps->sFrameCrop.iTopOffset + pSps->sFrameCrop.iBottomOffset) > ((int32_t)pSps->iMbHeight * 16 / 2)) {
1091− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "frame_crop_top_offset + frame_crop_right_offset exceeds limits!");
1092+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "frame_crop_top_offset + frame_crop_right_offset exceeds limits!");
1093+ return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_CROPPING_DATA);
10921094 }
10931095 } else {
10941096 pSps->sFrameCrop.iLeftOffset = 0; // frame_crop_left_offset

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t