virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

vp9: Use the correct upper bound for seg_id

Browse Source 
And use a macro to make apparent why the value.

Bug-Id: CID 1108595
This commit is contained in:
Luca Barbato 2014-11-11 13:27:01 +01:00 committed by Vittorio Giovara
parent d466d82faa
commit 312daa1589
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vp9.h
View File

@ -313,6 +313,7 @@ typedef struct VP9Context {
uint8_t temporal; uint8_t temporal;
uint8_t absolute_vals; uint8_t absolute_vals;
uint8_t update_map; uint8_t update_map;
#define MAX_SEGMENT 8
struct { struct {
uint8_t q_enabled; uint8_t q_enabled;
uint8_t lf_enabled; uint8_t lf_enabled;
@ -323,7 +324,7 @@ typedef struct VP9Context {
int8_t lf_val; int8_t lf_val;
int16_t qmul[2][2]; int16_t qmul[2][2];
uint8_t lflvl[4][2]; uint8_t lflvl[4][2];
} feat[8]; } feat[MAX_SEGMENT];
} segmentation; } segmentation;
struct { struct {
unsigned log2_tile_cols, log2_tile_rows; unsigned log2_tile_cols, log2_tile_rows;

3
libavcodec/vp9block.c
View File

@ -71,7 +71,8 @@ static void decode_mode(VP9Context *s, VP9Block *const b)
vp56_rac_get_prob_branchy(&s->c, vp56_rac_get_prob_branchy(&s->c,
s->prob.segpred[s->above_segpred_ctx[col] + s->prob.segpred[s->above_segpred_ctx[col] +
s->left_segpred_ctx[row7]]))) { s->left_segpred_ctx[row7]]))) {
int pred = 8, x; int pred = MAX_SEGMENT - 1;
int x;
for (y = 0; y < h4; y++) for (y = 0; y < h4; y++)
for (x = 0; x < w4; x++) for (x = 0; x < w4; x++)