From 158f189f82839bd41421f7f262e405f040503618 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 9 Apr 2009 18:21:51 +0000 Subject: [PATCH] Factorize check of read symbols. Originally committed as revision 18390 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/snow.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 93bca04..695f36f 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -3553,6 +3553,14 @@ static void decode_qlogs(SnowContext *s){ } } +#define GET_S(dst, check) \ + tmp= get_symbol(&s->c, s->header_state, 0);\ + if(!(check)){\ + av_log(s->avctx, AV_LOG_ERROR, "Error " #dst " is %d\n", tmp);\ + return -1;\ + }\ + dst= tmp; + static int decode_header(SnowContext *s){ int plane_index, tmp; uint8_t kstate[32]; @@ -3570,10 +3578,7 @@ static int decode_header(SnowContext *s){ } if(s->keyframe){ s->version= get_symbol(&s->c, s->header_state, 0); - if(s->version>0){ - av_log(s->avctx, AV_LOG_ERROR, "version %d not supported", s->version); - return -1; - } + GET_S(s->version, tmp <= 0U) s->always_reset= get_rac(&s->c, s->header_state); s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0); s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0); @@ -3583,12 +3588,8 @@ static int decode_header(SnowContext *s){ s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0); s->spatial_scalability= get_rac(&s->c, s->header_state); // s->rate_scalability= get_rac(&s->c, s->header_state); - tmp= get_symbol(&s->c, s->header_state, 0)+1; - if(tmp < 1 || tmp > MAX_REF_FRAMES){ - av_log(s->avctx, AV_LOG_ERROR, "reference frame count is %d\n", tmp); - return -1; - } - s->max_ref_frames= tmp; + GET_S(s->max_ref_frames, tmp < (unsigned)MAX_REF_FRAMES) + s->max_ref_frames++; decode_qlogs(s); } -- 2.7.4