From patchwork Thu May 7 11:14:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19531 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 68C2544984D for ; Thu, 7 May 2020 14:14:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4EA0968A176; Thu, 7 May 2020 14:14:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 569AE68A0F8 for ; Thu, 7 May 2020 14:14:31 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id 207so2687083pgc.6 for ; Thu, 07 May 2020 04:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1u3VFro4en/8JM/GNWBHnFMIZJyJl1xk1bGJ4SjGrNw=; b=Bg2XCdUz7YW5cGEqOBWhtLijcbhp2FjnYJYmFsQjexAb1T65QjlqFDqj4MNTyQFSIm 4kkwYiSBZMeiwymLT3urmNKirmPETmj39fCDJZyw16YJa1YOtZHI7WyJp8xsJollC+r5 +VtPThHiQ08KuQSqk7Jh40NvMBy1QObsjbMAI2JjBEyq0pbdyoZmEl9hnyyyxbmIDpAg hn/KS6cu7K84Z/aQpceWZhdXYbi0LRlCas0aIhsXrVx12KnUbCJiMW8aJh/X5a/Wax+F +Knim3rCIVbQ1fCiXFmiaz518ur9OJjLH0f2WmglpaaB+Tfo9FqBIWVLI6tFPulLJsIw nPdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1u3VFro4en/8JM/GNWBHnFMIZJyJl1xk1bGJ4SjGrNw=; b=sqY7vSLOWSO/95GnZDR6z8u2iGuosNIxzXJ8P7vraa6RuS7L4cX2Bgl3EbrRN0/rXo GPbjvG9if1FLb6jtfSBmQFq+Lp9WQ8Anm7EvwMNzWQqcQPl3b6Xs2mR/Tz0egzlSbdpg sVU6TkKooB4FM0g8edCeLy3CuoNMDKskqZc3oDXykMT4Ubzp9GoY/yK2ZpQE5PDFENgY PZsnr3Z3nvrMWInoapzCaucvY2RR7FwfxCf0CzgpccqZDPQ4J16T1D8QVePZBhbKf75z YSOV4NLSoc/UcxJZfKFCJ9hhSSL6sEFFvRbcVqrxneuDwSSb+FPUEdO5e7n3672XvW6t mW8w== X-Gm-Message-State: AGi0PuarmwCyjs3I/4Qpbtek9RjSzuJrH984Qk5tYhy2TDTtmYbXfndB brft+ZNNGck/2qPkSRMRF1UPLEOl X-Google-Smtp-Source: APiQypJKsmZJBgQJAuppaeaC6mPTFiiFVV8Y4jKzwOe+7UKE0rbIkJSaYAfHHLpsmAYp+yL+oy04Lg== X-Received: by 2002:a63:750b:: with SMTP id q11mr10913677pgc.138.1588850068987; Thu, 07 May 2020 04:14:28 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y10sm4507551pfb.53.2020.05.07.04.14.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2020 04:14:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 19:14:16 +0800 Message-Id: <1588850057-24236-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588850057-24236-1-git-send-email-lance.lmwang@gmail.com> References: <1588850057-24236-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/5] avcodec/mpegvideo: return more specific error codes for ff_mpv_common_init() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/mpegvideo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 22cab28..b5ddb1b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -889,7 +889,7 @@ static void clear_context(MpegEncContext *s) */ av_cold int ff_mpv_common_init(MpegEncContext *s) { - int i, ret; + int i, ret = AVERROR(ENOMEM); int nb_slices = (HAVE_THREADS && s->avctx->active_thread_type & FF_THREAD_SLICE) ? s->avctx->thread_count : 1; @@ -907,7 +907,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) { av_log(s->avctx, AV_LOG_ERROR, "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)) { @@ -923,7 +923,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if ((s->width || s->height) && av_image_check_size(s->width, s->height, 0, s->avctx)) - return -1; + return AVERROR(EINVAL); dct_init(s); @@ -954,7 +954,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (!s->new_picture.f) goto fail; - if (init_context_frame(s)) + if ((ret = init_context_frame(s))) goto fail; s->parse_context.state = -1; @@ -971,7 +971,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (!s->thread_context[i]) goto fail; } - if (init_duplicate_context(s->thread_context[i]) < 0) + if ((ret = init_duplicate_context(s->thread_context[i])) < 0) goto fail; s->thread_context[i]->start_mb_y = (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; } } else { - if (init_duplicate_context(s) < 0) + if ((ret = init_duplicate_context(s)) < 0) goto fail; s->start_mb_y = 0; s->end_mb_y = s->mb_height; @@ -990,7 +990,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) return 0; fail: ff_mpv_common_end(s); - return -1; + return ret; } /**