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

Fix the upper limit of row/column tile index

Browse Source 
If the decoder is configured to decode a tile indexed above the
upper limit, the internal codec will clip the index to the upper
limits.

Change-Id: Icbc1bb7b14069ac009e0a2042dd66a46d6f76679
This commit is contained in:
Jingning Han 2015-05-29 09:09:33 -07:00
parent f5660af165
commit b71176b477
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/decoder/vp9_decodeframe.c
View File

@ -1962,9 +1962,9 @@ static void get_tile_buffers(VP9Decoder *pbi,
const uint8_t *tile_end_col[1024];
size_t tile_col_size;
int tile_col_limit = (pbi->dec_tile_col == -1) ? INT_MAX :
MIN(pbi->dec_tile_col, tile_cols);
MIN(pbi->dec_tile_col, tile_cols - 1);
int tile_row_limit = (pbi->dec_tile_row == -1) ? INT_MAX :
MIN(pbi->dec_tile_row, tile_rows);
MIN(pbi->dec_tile_row, tile_rows - 1);
for (c = 0; c < tile_cols && c <= tile_col_limit; ++c) {
if (c < tile_cols - 1) {
@ -2045,9 +2045,9 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi,
#if CONFIG_ROW_TILE
TileBuffer (*tile_buffers)[1024] = pbi->tile_buffers;
const int tile_col_limit = (pbi->dec_tile_col == -1) ? INT_MAX :
MIN(pbi->dec_tile_col, tile_cols);
MIN(pbi->dec_tile_col, tile_cols - 1);
const int tile_row_limit = (pbi->dec_tile_row == -1) ? INT_MAX :
MIN(pbi->dec_tile_row, tile_rows);
MIN(pbi->dec_tile_row, tile_rows - 1);
#else
TileBuffer tile_buffers[4][1024];
const int tile_col_limit = INT_MAX;