From 4b13a542a27d41dedd130fd57cd018c3bb9b54b5 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Wed, 6 May 2015 16:54:40 +0200 Subject: [PATCH] dirac: use and forward error codes Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer --- libavcodec/dirac_dwt.c | 2 +- libavcodec/diracdec.c | 75 +++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c index da2da75c07..ee3665e7ce 100644 --- a/libavcodec/dirac_dwt.c +++ b/libavcodec/dirac_dwt.c @@ -537,7 +537,7 @@ int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height break; default: av_log(NULL, AV_LOG_ERROR, "Unknown wavelet type %d\n", type); - return -1; + return AVERROR_INVALIDDATA; } if (HAVE_MMX) ff_spatial_idwt_init_mmx(d, type); diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index d452982d02..e60147a01e 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -884,7 +884,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) if (idx > 4) { av_log(s->avctx, AV_LOG_ERROR, "Block prediction index too high\n"); - return -1; + return AVERROR_INVALIDDATA; } if (idx == 0) { @@ -904,15 +904,15 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) if (!s->plane[0].xbsep || !s->plane[0].ybsep || s->plane[0].xbsep < s->plane[0].xblen/2 || s->plane[0].ybsep < s->plane[0].yblen/2) { av_log(s->avctx, AV_LOG_ERROR, "Block separation too small\n"); - return -1; + return AVERROR_INVALIDDATA; } if (s->plane[0].xbsep > s->plane[0].xblen || s->plane[0].ybsep > s->plane[0].yblen) { av_log(s->avctx, AV_LOG_ERROR, "Block separation greater than size\n"); - return -1; + return AVERROR_INVALIDDATA; } if (FFMAX(s->plane[0].xblen, s->plane[0].yblen) > MAX_BLOCKSIZE) { av_log(s->avctx, AV_LOG_ERROR, "Unsupported large block size\n"); - return -1; + return AVERROR_PATCHWELCOME; } /*[DIRAC_STD] 11.2.5 Motion vector precision. motion_vector_precision() @@ -920,7 +920,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) s->mv_precision = svq3_get_ue_golomb(gb); if (s->mv_precision > 3) { av_log(s->avctx, AV_LOG_ERROR, "MV precision finer than eighth-pel\n"); - return -1; + return AVERROR_INVALIDDATA; } /*[DIRAC_STD] 11.2.6 Global motion. global_motion() @@ -959,7 +959,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) Picture prediction mode, not currently used. */ if (svq3_get_ue_golomb(gb)) { av_log(s->avctx, AV_LOG_ERROR, "Unknown picture prediction mode\n"); - return -1; + return AVERROR_INVALIDDATA; } /* [DIRAC_STD] 11.2.8 Reference picture weight. reference_picture_weights() @@ -991,7 +991,7 @@ static int dirac_unpack_idwt_params(DiracContext *s) tmp = svq3_get_ue_golomb(gb); \ if (cond) { \ av_log(s->avctx, AV_LOG_ERROR, errmsg); \ - return -1; \ + return AVERROR_INVALIDDATA; \ }\ dst = tmp; @@ -1255,7 +1255,7 @@ static int dirac_unpack_block_motion_data(DiracContext *s) for (x = 0; x < s->sbwidth; x++) { unsigned int split = dirac_get_arith_uint(arith, CTX_SB_F1, CTX_SB_DATA); if (split > 2) - return -1; + return AVERROR_INVALIDDATA; sbsplit[x] = (split + pred_sbsplit(sbsplit+x, s->sbwidth, x, y)) % 3; } sbsplit += s->sbwidth; @@ -1623,9 +1623,10 @@ static int dirac_decode_frame_internal(DiracContext *s) memset(p->idwt_buf, 0, p->idwt_stride * p->idwt_height * sizeof(IDWTELEM)); decode_component(s, comp); /* [DIRAC_STD] 13.4.1 core_transform_data() */ } - if (ff_spatial_idwt_init2(&d, p->idwt_buf, p->idwt_width, p->idwt_height, p->idwt_stride, - s->wavelet_idx+2, s->wavelet_depth, p->idwt_tmp)) - return -1; + ret = ff_spatial_idwt_init2(&d, p->idwt_buf, p->idwt_width, p->idwt_height, p->idwt_stride, + s->wavelet_idx+2, s->wavelet_depth, p->idwt_tmp); + if (ret < 0) + return ret; if (!s->num_refs) { /* intra */ for (y = 0; y < p->height; y += 16) { @@ -1706,7 +1707,7 @@ static int get_buffer_with_edge(AVCodecContext *avctx, AVFrame *f, int flags) static int dirac_decode_picture_header(DiracContext *s) { unsigned retire, picnum; - int i, j; + int i, j, ret; int64_t refdist, refnum; GetBitContext *gb = &s->gb; @@ -1749,7 +1750,7 @@ static int dirac_decode_picture_header(DiracContext *s) if (!s->ref_pics[i]) { av_log(s->avctx, AV_LOG_ERROR, "Reference could not be allocated\n"); - return -1; + return AVERROR_INVALIDDATA; } } @@ -1774,13 +1775,16 @@ static int dirac_decode_picture_header(DiracContext *s) } if (s->num_refs) { - if (dirac_unpack_prediction_parameters(s)) /* [DIRAC_STD] 11.2 Picture Prediction Data. picture_prediction() */ - return -1; - if (dirac_unpack_block_motion_data(s)) /* [DIRAC_STD] 12. Block motion data syntax */ - return -1; + ret = dirac_unpack_prediction_parameters(s); /* [DIRAC_STD] 11.2 Picture Prediction Data. picture_prediction() */ + if (ret < 0) + return ret; + ret = dirac_unpack_block_motion_data(s); /* [DIRAC_STD] 12. Block motion data syntax */ + if (ret < 0) + return ret; } - if (dirac_unpack_idwt_params(s)) /* [DIRAC_STD] 11.3 Wavelet transform data */ - return -1; + ret = dirac_unpack_idwt_params(s); /* [DIRAC_STD] 11.3 Wavelet transform data */ + if (ret < 0) + return ret; init_planes(s); return 0; @@ -1829,7 +1833,7 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int unsigned tmp; if (size < DATA_UNIT_HEADER_SIZE) - return -1; + return AVERROR_INVALIDDATA; parse_code = buf[4]; @@ -1840,13 +1844,15 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int return 0; /* [DIRAC_STD] 10. Sequence header */ - if (avpriv_dirac_parse_sequence_header(avctx, &s->gb, &s->source)) - return -1; + ret = avpriv_dirac_parse_sequence_header(avctx, &s->gb, &s->source); + if (ret < 0) + return ret; avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); - if (alloc_sequence_buffers(s)) - return -1; + ret = alloc_sequence_buffers(s); + if (ret < 0) + return ret; s->seen_sequence_header = 1; } else if (parse_code == pc_eos) { /* [DIRAC_STD] End of Sequence */ @@ -1864,7 +1870,7 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int } else if (parse_code & 0x8) { /* picture data unit */ if (!s->seen_sequence_header) { av_log(avctx, AV_LOG_DEBUG, "Dropping frame without sequence header\n"); - return -1; + return AVERROR_INVALIDDATA; } /* find an unused frame */ @@ -1873,7 +1879,7 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int pic = &s->all_frames[i]; if (!pic) { av_log(avctx, AV_LOG_ERROR, "framelist full\n"); - return -1; + return AVERROR_INVALIDDATA; } av_frame_unref(pic->avframe); @@ -1882,7 +1888,7 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int tmp = parse_code & 0x03; /* [DIRAC_STD] num_refs() */ if (tmp > 2) { av_log(avctx, AV_LOG_ERROR, "num_refs of 3\n"); - return -1; + return AVERROR_INVALIDDATA; } s->num_refs = tmp; s->is_arith = (parse_code & 0x48) == 0x08; /* [DIRAC_STD] using_ac() */ @@ -1902,12 +1908,14 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int return AVERROR(ENOMEM); /* [DIRAC_STD] 11.1 Picture parse. picture_parse() */ - if (dirac_decode_picture_header(s)) - return -1; + ret = dirac_decode_picture_header(s); + if (ret < 0) + return ret; /* [DIRAC_STD] 13.0 Transform data syntax. transform_data() */ - if (dirac_decode_frame_internal(s)) - return -1; + ret = dirac_decode_frame_internal(s); + if (ret < 0) + return ret; } return 0; } @@ -1958,10 +1966,11 @@ static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, continue; } /* [DIRAC_STD] dirac_decode_data_unit makes reference to the while defined in 9.3 inside the function parse_sequence() */ - if (dirac_decode_data_unit(avctx, buf+buf_idx, data_unit_size)) + ret = dirac_decode_data_unit(avctx, buf+buf_idx, data_unit_size); + if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR,"Error in dirac_decode_data_unit\n"); - return -1; + return ret; } buf_idx += data_unit_size; }