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

Merge "Set row and col tile number upper limit as 1024" into nextgen

Browse Source
This commit is contained in:
Jingning Han
2015-05-21 19:49:58 +00:00
committed by Gerrit Code Review
parent d43544137b 46afda0908
commit a3a3fee09f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/decoder/vp9_decodeframe.c
View File

@@ -1871,14 +1871,20 @@ static void setup_tile_info(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb) {
while (max_ones-- && vp9_rb_read_bit(rb)) while (max_ones-- && vp9_rb_read_bit(rb))
cm->log2_tile_cols++; cm->log2_tile_cols++;
if (cm->log2_tile_cols > 6) if (cm->log2_tile_cols > 10)
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid number of tile columns"); "Invalid number of tile columns");
// rows // rows
#if CONFIG_ROW_TILE
if (cm->log2_tile_rows > 10)
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid number of tile columns");
#else
cm->log2_tile_rows = vp9_rb_read_bit(rb); cm->log2_tile_rows = vp9_rb_read_bit(rb);
if (cm->log2_tile_rows) if (cm->log2_tile_rows)
cm->log2_tile_rows += vp9_rb_read_bit(rb); cm->log2_tile_rows += vp9_rb_read_bit(rb);
#endif
} }
typedef struct TileBuffer { typedef struct TileBuffer {