har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpegvideo: return more specific error codes for ff_mpv_common_init()

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2020-05-08 06:57:58 +08:00
parent 0032ca45ff
commit 18e2c0e732
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/mpegvideo.c
View File

@ -907,7 +907,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) { if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"decoding to AV_PIX_FMT_NONE is not supported.\n"); "decoding to AV_PIX_FMT_NONE is not supported.\n");
return -1; return AVERROR(EINVAL);
} }
if (nb_slices > MAX_THREADS || (nb_slices > s->mb_height && s->mb_height)) { if (nb_slices > MAX_THREADS || (nb_slices > s->mb_height && s->mb_height)) {
@ -923,7 +923,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
if ((s->width || s->height) && if ((s->width || s->height) &&
av_image_check_size(s->width, s->height, 0, s->avctx)) av_image_check_size(s->width, s->height, 0, s->avctx))
return -1; return AVERROR(EINVAL);
dct_init(s); dct_init(s);
@ -935,27 +935,27 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
return ret; return ret;
FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
MAX_PICTURE_COUNT * sizeof(Picture), fail); MAX_PICTURE_COUNT * sizeof(Picture), fail_nomem);
for (i = 0; i < MAX_PICTURE_COUNT; i++) { for (i = 0; i < MAX_PICTURE_COUNT; i++) {
s->picture[i].f = av_frame_alloc(); s->picture[i].f = av_frame_alloc();
if (!s->picture[i].f) if (!s->picture[i].f)
goto fail; goto fail_nomem;
} }
s->next_picture.f = av_frame_alloc(); s->next_picture.f = av_frame_alloc();
if (!s->next_picture.f) if (!s->next_picture.f)
goto fail; goto fail_nomem;
s->last_picture.f = av_frame_alloc(); s->last_picture.f = av_frame_alloc();
if (!s->last_picture.f) if (!s->last_picture.f)
goto fail; goto fail_nomem;
s->current_picture.f = av_frame_alloc(); s->current_picture.f = av_frame_alloc();
if (!s->current_picture.f) if (!s->current_picture.f)
goto fail; goto fail_nomem;
s->new_picture.f = av_frame_alloc(); s->new_picture.f = av_frame_alloc();
if (!s->new_picture.f) if (!s->new_picture.f)
goto fail; goto fail_nomem;
if (init_context_frame(s)) if ((ret = init_context_frame(s)))
goto fail; goto fail_nomem;
s->parse_context.state = -1; s->parse_context.state = -1;
@ -969,9 +969,9 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
if (i) { if (i) {
s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext)); s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
if (!s->thread_context[i]) if (!s->thread_context[i])
goto fail; goto fail_nomem;
} }
if (init_duplicate_context(s->thread_context[i]) < 0) if ((ret = init_duplicate_context(s->thread_context[i])) < 0)
goto fail; goto fail;
s->thread_context[i]->start_mb_y = s->thread_context[i]->start_mb_y =
(s->mb_height * (i) + nb_slices / 2) / nb_slices; (s->mb_height * (i) + nb_slices / 2) / nb_slices;
@ -979,7 +979,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
(s->mb_height * (i + 1) + nb_slices / 2) / nb_slices; (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
} }
} else { } else {
if (init_duplicate_context(s) < 0) if ((ret = init_duplicate_context(s)) < 0)
goto fail; goto fail;
s->start_mb_y = 0; s->start_mb_y = 0;
s->end_mb_y = s->mb_height; s->end_mb_y = s->mb_height;
@ -988,9 +988,11 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
// } // }
return 0; return 0;
fail_nomem:
ret = AVERROR(ENOMEM);
fail: fail:
ff_mpv_common_end(s); ff_mpv_common_end(s);
return -1; return ret;
} }
/** /**