virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

decode: make sure ff_get_buffer() cleans the frame on failure

Browse Source 
Merge ff_get_buffer() and get_buffer_internal() to simplify the code.
This commit is contained in:
Anton Khirnov 2020-04-05 10:48:33 +02:00
parent e923a35988
commit a1133db30e
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/decode.c
View File

@ -1903,7 +1903,7 @@ int ff_attach_decode_data(AVFrame *frame)
return 0; return 0;
} }
static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
{ {
const AVHWAccel *hwaccel = avctx->hwaccel; const AVHWAccel *hwaccel = avctx->hwaccel;
int override_dimensions = 1; int override_dimensions = 1;
@ -1912,7 +1912,8 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
if ((ret = av_image_check_size2(FFALIGN(avctx->width, STRIDE_ALIGN), avctx->height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx)) < 0 || avctx->pix_fmt<0) { if ((ret = av_image_check_size2(FFALIGN(avctx->width, STRIDE_ALIGN), avctx->height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx)) < 0 || avctx->pix_fmt<0) {
av_log(avctx, AV_LOG_ERROR, "video_get_buffer: image parameters invalid\n"); av_log(avctx, AV_LOG_ERROR, "video_get_buffer: image parameters invalid\n");
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail;
} }
if (frame->width <= 0 || frame->height <= 0) { if (frame->width <= 0 || frame->height <= 0) {
@ -1923,56 +1924,48 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
if (frame->data[0] || frame->data[1] || frame->data[2] || frame->data[3]) { if (frame->data[0] || frame->data[1] || frame->data[2] || frame->data[3]) {
av_log(avctx, AV_LOG_ERROR, "pic->data[*]!=NULL in get_buffer_internal\n"); av_log(avctx, AV_LOG_ERROR, "pic->data[*]!=NULL in get_buffer_internal\n");
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail;
} }
} else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) { } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
if (frame->nb_samples * (int64_t)avctx->channels > avctx->max_samples) { if (frame->nb_samples * (int64_t)avctx->channels > avctx->max_samples) {
av_log(avctx, AV_LOG_ERROR, "samples per frame %d, exceeds max_samples %"PRId64"\n", frame->nb_samples, avctx->max_samples); av_log(avctx, AV_LOG_ERROR, "samples per frame %d, exceeds max_samples %"PRId64"\n", frame->nb_samples, avctx->max_samples);
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail;
} }
} }
ret = ff_decode_frame_props(avctx, frame); ret = ff_decode_frame_props(avctx, frame);
if (ret < 0) if (ret < 0)
return ret; goto fail;
if (hwaccel) { if (hwaccel) {
if (hwaccel->alloc_frame) { if (hwaccel->alloc_frame) {
ret = hwaccel->alloc_frame(avctx, frame); ret = hwaccel->alloc_frame(avctx, frame);
goto end; goto fail;
} }
} else } else
avctx->sw_pix_fmt = avctx->pix_fmt; avctx->sw_pix_fmt = avctx->pix_fmt;
ret = avctx->get_buffer2(avctx, frame, flags); ret = avctx->get_buffer2(avctx, frame, flags);
if (ret < 0) if (ret < 0)
goto end; goto fail;
validate_avframe_allocation(avctx, frame); validate_avframe_allocation(avctx, frame);
ret = ff_attach_decode_data(frame); ret = ff_attach_decode_data(frame);
if (ret < 0) if (ret < 0)
goto end; goto fail;
end:
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions && if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions &&
!(avctx->codec->caps_internal & FF_CODEC_CAP_EXPORTS_CROPPING)) { !(avctx->codec->caps_internal & FF_CODEC_CAP_EXPORTS_CROPPING)) {
frame->width = avctx->width; frame->width = avctx->width;
frame->height = avctx->height; frame->height = avctx->height;
} }
if (ret < 0) return 0;
av_frame_unref(frame); fail:
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; av_frame_unref(frame);
}
int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
{
int ret = get_buffer_internal(avctx, frame, flags);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
frame->width = frame->height = 0;
}
return ret; return ret;
} }