From patchwork Tue Nov 9 18:01:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31352 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494365iob; Tue, 9 Nov 2021 10:03:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7Zv+ni8DJS0vx7XWUVZIimunPvzDyJsO3kojSF6b3erCz/dRCRci/wD2LH0oLWjyvrFlg X-Received: by 2002:a17:907:160a:: with SMTP id hb10mr12400545ejc.83.1636481028126; Tue, 09 Nov 2021 10:03:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw4si8853100ejc.93.2021.11.09.10.03.47; Tue, 09 Nov 2021 10:03:48 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="pr/OaKOq"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9379B68AE14; Tue, 9 Nov 2021 20:02:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 734C668ADC9 for ; Tue, 9 Nov 2021 20:02:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ty+yJUYjvQNFwtm9eQWSJzLaqmcCOfElDYCgTrEWiMVcQgg2pbST9ltJ1ftA1MYJxQYyrDH3Tqo+IQaNCwcQiNwYF+Evnm/0s+jOIUUnymEp1X48AN3pXQYLppZZqlZTsO7kRMcOZEUCxAuMeuY7swHO/FF5NfroznNj8Y7O/LA+4QspAQg0NOtny1KG5fBJbsTGirh6wHrqcXXfEKmn1bh7qa/E83sjZno67KjTtmVtVbycXPuBDxYXnTZXNgR1kRCUYW89uja1/0gNtXIqgwC/IXD9hNmN+5gU/zgWT3i0w6P6/rqNxAhV2ZfPCHyVSsgJFKGB/Z4LQVQe5yzQKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oU+JxAmsDsCDHYoPZgzDgOl4Uy/UjxwvzjyF30VAxVs=; b=C5PLOzFG7k3ZZDiFnFHjkBJDPucs4PCkkqiIO4uIcDKR32Lx6VbtKY66KndyaEMDEdIgmZT1c5IGWVulRqBOh/DZeBj78j3hbAjcAgWQU9J7qImAokdPZ2ouyp/EHygeFPo4Hb+NAuM3kiFvpzsPzZxnslqLWXHGosQ2v9Sucv5GyY4Q+VynLxlsUTr7MwK5qZZqIqCi499eVukkkca2cJZ6vHjv6KtlIKLkLP9U04z0Q+mAv+L9T+xZuquYkzm4XPkETokxklUdSn85D8gL9VntfQpcONa3AR4Gr+MLnY2q6VUmNhjqHMubarMw+Jxv3LRBVHyKvsA7rgi3tzvHKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oU+JxAmsDsCDHYoPZgzDgOl4Uy/UjxwvzjyF30VAxVs=; b=pr/OaKOqsgPo3H35rXrNvz0lHyV+b5jYA/sx1GiTmaLZq2cgZvd0DRaD7ZBBYe3pmlPWTFMWpdGpM49hbkMwbhMnIAFRCsJ31yivk08Rq0GQe+fcTxOvuFYL3f80AeWORQ1BQVwHW8ldICKqAQPCRWJbrX8NN7nc9LexO3TTDaxHvE5MJj5L6cMRal9FDjXymcwG2aICt1lzRpjURSz1Gc87FUATi/2YIfsLu377E1l/kVLBy1eK8NoYV8GpfrwdXy0Q32i+DGGGeiUe3m409UNNKTpt4FJk+rToujRInQnK/fQEhlvwbcLE8cBwtOr7P2bsjDQ2yERdCZOwAU7Azw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:20 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:46 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2w0AeRV3kVZxeQEb8YaOQl/0my85Hxfg] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bcc2a0e-9729-4a72-a8ce-08d9a3ab12c8 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9Sy2F1pulybUyurpjJjACKJHAvrl1/OMJrWJdyUTj4eEcIVIKFMzZkuHvOs4J/fErCXTZUJWQuvhbmtz5CQj8+Xgi8UKjP8scJWJUIE6Ni1CJng4eCWCCTEyva9sYwU/lCKXh6oDRWxXhRzNDAmgOqOAXALV293UcgNfLSE7hiSZeRjT1G2lBzRXe9+AisO4i2OTDIRj0V/2vJ2HjapdYcdleRaF0e7qHu0lIxhtjIIJSJaLd37jaPd4LNU22abBDLU3xykfeUttWlpm1YpPg2BoQlO6eoAcJzJfyh33S8P24PTP//2qEI3feiT0eYahsnPb0iwI1xmOu56uj1bXq49wZoqImmoB0MsBIelaEwI0CkuD9yw0O2ONz/No6dG8c8M19k1j3NGr3gecNuRGJr3qTMzYpC4YlukQrjX/qiRbhBHAR5wmT9OlXMFIy3uhsx9rfRZ1FZ4Lj5B9JndTctsUjA69ucyJPX8idtF+kXXUVh36ZLDhjfRV0171GyKY/klvoipkUjKX8zyQw8WGUt6ZZcLC5EXa8oK8DSftVensgn+tAU/YDqDidrnLxXUzp7zu1FpweuYn+SR18iKWy/UqfQDCs+fQ+OgtZm5or8a2sxxmeC5fB4P8NVJipE9b6HObgyoMJohoDuhWNOxvWfwkH1df05rp9cTAhWZC91W863t0hwZroJjccgrpw8jK4PMlHc7S1Pp+DfRNBiCPAhfHTIgjJmmu5MceXqOAtjmrZU= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o58ElTBuG9SMiEMXZTwN0xBXaJ5mxCznR3CABSwvsi+v+A5Dda/GuV4ZJU3V/7S/RwMXI+4DB+ScVpZawDt7xT7CK0JLrhKS+JJeLMfGerHAHCJlAYmlw9lMsu6y6f84w/NqpaUQKQNQtZ1MOeJyaj7X4o+3h5AniA1qwzqNcaTLV+7sMnfA5xiYjvPvg0it5L1+EibuzvDq6U2pEuHyebYzs16csatpMxg87nrwHia379lTDQXRUXQUo8A4mEi1mCpnKaPHJBD2CjnlIUY1HiNwASP4Rnxi91joI4ofjbXmgt+fFEkeEDNQ0wRpfbRxR4bdvp43elG7UmY9d4pSxQDcTjkZHcSShcggXjl89YEyj0nGbHXGc3LSyHCIH7pgDBsrimuoUUkX0oa3DeF6BwMJwu2UXizHnUCv6FwLD7xy3u9kOjpUnmBtuCJvaAX/amNsR9ilGKKM9dmwD2C+h4GuA+0Ri33/8deelEv0vFAq4HDatZamtP8Ldl11oAAcMwbWP3gfDoHTC/GvPLKzEMPtoU1cwJ1wKD2h9vVI3K8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oj8YQzvRf8MaxkDHZ12uqSMG0fThjDEY6qvn6a3hDWI09su3OmGnXVff3zFLn9Pu6N46FoRM2mlgewQHu8/EVZogxdP09CxQe/hAEhHrIv9s1oe9jbrU5w1ZqVgzHBVwElxrJK5gIFxJGxYo/r8KXlX6oJ+4FFtSIVJ74e8yXlR/dliL6EEc1ZyGAMMtFoEKJ7aw4WAA24+FMtWJKnSZyU7kPFcJz/fVMRiZwd1q0zccXXc0Dj1iBPD3WtyLoGcCakdfh0r4SEr5/c+Ypsj51gp64CRZ6zxF7J/c01f/M/jNIJIUY0XVKcClY6rFLMSDTkdo96VdeVLsLgpBDgc/QTTDNs0jkixdiNiitBdBa2HfeU5zngcM7gwIKUKS3ICb0H5OfU+iruJQS0rgxQ0b7JPvejZyQm6kvjGSQThGkeakVnTdeML93PBNfZbjKPGq9xqb5Q3+FidvYbRys9ZvzgwFPXuuA2JlY/LCeAGW/QnrVOXnVo6EfUHTpayTmjQ+wSnaCMVfFKGAIBYgc66rba9kH2rSup4CkE9YLmD+WM7Ynw72+ihl84yCJFoqw3GwHlEDvPMd+ILhEJGc6jIjG2jLIgIIENxxK74lWKv0LTZ1XAB8bdzkAw7mIc7GjCd3r3Y7/a/fTHeXMNbSw0p3v10uGqSupa/AwRkHgUNzLyuT/vlQ5wK5I4kN0qECLo6pchlLdOSUvvcrzdvGwtf3xg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bcc2a0e-9729-4a72-a8ce-08d9a3ab12c8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:20.2786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 08/17] avformat/mxfenc: Improve returned error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9MHUsS+fQCx0 Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c20ba9bfca..cf63340313 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2509,7 +2509,7 @@ static int mxf_init(AVFormatContext *s) if (s->oformat == &ff_mxf_opatom_muxer && s->nb_streams !=1) { av_log(s, AV_LOG_ERROR, "there must be exactly one stream for mxf opatom\n"); - return -1; + return AVERROR(EINVAL); } if (!av_dict_get(s->metadata, "comment_", NULL, AV_DICT_IGNORE_SUFFIX)) @@ -2525,7 +2525,7 @@ static int mxf_init(AVFormatContext *s) if (((i == 0) ^ (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) && s->oformat != &ff_mxf_opatom_muxer) { av_log(s, AV_LOG_ERROR, "there must be exactly one video stream and it must be the first one\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2590,7 +2590,7 @@ static int mxf_init(AVFormatContext *s) ul_index = 4+ntsc; } else { av_log(s, AV_LOG_ERROR, "error MXF D-10 only support 30/40/50 mbit/s\n"); - return -1; + return AVERROR(EINVAL); } sc->codec_ul = &mxf_d10_codec_uls[ul_index]; @@ -2607,13 +2607,13 @@ static int mxf_init(AVFormatContext *s) char bsf_arg[32]; if (st->codecpar->sample_rate != 48000) { av_log(s, AV_LOG_ERROR, "only 48khz is implemented\n"); - return -1; + return AVERROR_PATCHWELCOME; } avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); if (s->oformat == &ff_mxf_d10_muxer) { if (st->index != 1) { av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE && st->codecpar->codec_id != AV_CODEC_ID_PCM_S24LE) { @@ -2657,11 +2657,11 @@ static int mxf_init(AVFormatContext *s) sc->index = INDEX_S436M; } else { av_log(s, AV_LOG_ERROR, "track %d: unsupported data type\n", i); - return -1; + return AVERROR(EINVAL); } if (st->index != s->nb_streams - 1) { av_log(s, AV_LOG_ERROR, "data track must be placed last\n"); - return -1; + return AVERROR(EINVAL); } } @@ -2670,7 +2670,7 @@ static int mxf_init(AVFormatContext *s) if (sc->index == -1) { av_log(s, AV_LOG_ERROR, "track %d: could not find essence container ul, " "codec not currently supported in container\n", i); - return -1; + return AVERROR(EINVAL); } }