From patchwork Thu May 7 11:14:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19530 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 6FE8C44984D for ; Thu, 7 May 2020 14:14:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 535F368A0C7; Thu, 7 May 2020 14:14:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D5E2689923 for ; Thu, 7 May 2020 14:14:29 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id h12so3724400pjz.1 for ; Thu, 07 May 2020 04:14:29 -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=GMftz6teSM5sINp7I3Iih8990+cmkl9RNmerUxqiKXE=; b=NMaplYZgypA5tP8kgGukYEyVxeN/gl+eE8OVcONQXA3qYw61208iBFx4KUdoGn0ycB j4BoQELwUrgvwhF4t9X0NzCt6zNVTHDhseK/RuOBarWd0n35ov/WDF8vGaDSnpmDTKAe h0fvW82icmIQqCvah2+SkKTTz2WR+uIZVpvoWMQ8bcLV1zXWcWbhGt+5jnXmX04oEgtR OhxGIWHslCkGKusJeTrz+vfYwzz7kzU5ST4D6bjs5Ph4gryLbSYytrZgPF5RaJxSEcCG F/YRKOXL+f/Mt7RL482FdFVY6U3yLDsFWyGPummHPuQXIkemSvq8w4McuNNYCJKNTIma IRwA== 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=GMftz6teSM5sINp7I3Iih8990+cmkl9RNmerUxqiKXE=; b=qd766Bo3HsOPbL+c7mOf4I0bhOUy5wJyBVg/O9LifU4j/uV568oUB7gEXvJhaDJKhy sePO8wTBAW4LubTeX32GRjA24a+D17VnZ3JBqR9AB09gghZHBT9YwtZC5/uwYazRkJan LdkDfdETUA2maXJxjeRa3mY7Fwf7D181357VZ4j65LfTb8gkX1awlE26xljcxNt3KERE nRhlr4UK8Y/t26w2WjrRl5u9RDW60mgC46mIZukWZu68ET2h9Dy7fpczF1wNYyaSB45E 8vdk5MVk1sXb7gZNCyqTdd2jE9Rjt0aaqMcOuKzA6LJ1HEmCIFe/O+F1X2db++Z5viAI v6aw== X-Gm-Message-State: AGi0PuYOIczbLaAybWXSFZ1qPFHijzwaobNu6i3m9Mm5WFkGLZ7A1gxH jjUPNMpM9icBsmIneHHvF1hZBOVy X-Google-Smtp-Source: APiQypJILmLuTl9exyDwSgv54EZS28LDxcmWHmL4Yqu4jERsudZkPW5HoKwhNdRkBKaoK7vBm8yjbA== X-Received: by 2002:a17:90b:b06:: with SMTP id bf6mr14531624pjb.179.1588850067428; Thu, 07 May 2020 04:14:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y10sm4507551pfb.53.2020.05.07.04.14.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2020 04:14:26 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 19:14:15 +0800 Message-Id: <1588850057-24236-3-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 3/5] avcodec/mpeg12enc: return more specific error codes for encode_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/mpeg12enc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 643ba81..cab7076 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -139,16 +139,17 @@ static int find_frame_rate_index(MpegEncContext *s) static av_cold int encode_init(AVCodecContext *avctx) { + int ret; MpegEncContext *s = avctx->priv_data; - if (ff_mpv_encode_init(avctx) < 0) - return -1; + if ((ret = ff_mpv_encode_init(avctx)) < 0) + return ret; if (find_frame_rate_index(s) < 0) { if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); - return -1; + return AVERROR(EINVAL); } else { av_log(avctx, AV_LOG_INFO, "MPEG-1/2 does not support %d/%d fps, there may be AV sync issues\n", @@ -159,7 +160,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (avctx->profile == FF_PROFILE_UNKNOWN) { if (avctx->level != FF_LEVEL_UNKNOWN) { av_log(avctx, AV_LOG_ERROR, "Set profile and level\n"); - return -1; + return AVERROR(EINVAL); } /* Main or 4:2:2 */ avctx->profile = s->chroma_format == CHROMA_420 ? FF_PROFILE_MPEG2_MAIN : FF_PROFILE_MPEG2_422; @@ -175,7 +176,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (avctx->profile != FF_PROFILE_MPEG2_HIGH && s->chroma_format != CHROMA_420) { av_log(avctx, AV_LOG_ERROR, "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n"); - return -1; + return AVERROR(EINVAL); } if (avctx->width <= 720 && avctx->height <= 576) avctx->level = 8; /* Main */ @@ -205,7 +206,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (s->drop_frame_timecode && s->frame_rate_index != 4) { av_log(avctx, AV_LOG_ERROR, "Drop frame time code only allowed with 1001/30000 fps\n"); - return -1; + return AVERROR(EINVAL); } #if FF_API_PRIVATE_OPT