From patchwork Fri Sep 24 16:37:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30555 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698406iob; Fri, 24 Sep 2021 09:37:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjsOT6ziZxMxDZ5mDy1f9sP0RmUUCCI7gB51pFR7mooJLNjdc8LZ7MmQDKYOnoRs9rqrJw X-Received: by 2002:a50:f1db:: with SMTP id y27mr6071028edl.26.1632501468263; Fri, 24 Sep 2021 09:37:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 26si11427036ejk.643.2021.09.24.09.37.47; Fri, 24 Sep 2021 09:37:48 -0700 (PDT) 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=Tc6kc1SM; 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 7385568A716; Fri, 24 Sep 2021 19:37:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070015.outbound.protection.outlook.com [40.92.70.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A78868A6EE for ; Fri, 24 Sep 2021 19:37:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VbFdVZ4RVAPuXfqnvg4XxQ3TAX5PF4aWvoc11dCW57VXZqtl9Oke3lLaCHbDepN15i6nhoKnaoPyDU0ZmRDvAmA+TzFDrcZvl5AV1S64eO6hMgYW1MaFJNpmZVBnxOMPLAcxUBYv8IRqYQGqYFbVEJHiTiAp/KoGkMhUD+CAyyCfRy6fnYntC8wi3NF+Gv/zjCD8qLOfqL9AJ00EUVCyQBZ/u8WUSqOKCpKHWvQb5RUeRzgfP+GpjydVV6Bdntt6razfe5+1stO8hj47v3zvk18Gas1Zwdc2tx7GYdPw0ebV0lDRX6YEaaPJ9L3oOjOrYYeD1PCQV7mlhz2IvOJGKw== 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; bh=0VzaRYK6M3i3GAurXd9lF7NXnI54l7KBmt0c8dxrOc0=; b=hb2elnh9Icqw6KVA2QFvR1drBD8KpwW2EBGKxWxD1gYhtZqAgP8HYr+irsvs35a5s8cNRZt+2YnLcjw6975kaNFAzlfe2T+NDVMVfTYqRpftlNN7y/D9CHYOX2TKnee8AGVAVPsE5El4oQNId0EOPhBIXR7ZICDPk0LoMxU0yjfViO7Gz1sr/HnBE5LyjentrvBZPN1zkrjqvyhDIrxGG0qORrYkG5t5nOg7rJBxAZ87i3vsFv2Dk7s/F/oIyDxyWFC+WTP3ofIe0TequReibpihBGxR8QccfxerNarVAXhKoiCse8+ygIAEQJxUGpS4a0wNq79HUbPFl+bCvLQbKw== 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=0VzaRYK6M3i3GAurXd9lF7NXnI54l7KBmt0c8dxrOc0=; b=Tc6kc1SMdbNiKNi5VLWR7aqnKAnaf2sEGxbE/jAl8zDlJQOjLvv0VAyymnG2A+JvrOZfzDgKjtsu6xMWPXAb9upS5KuULSOr+vy+J+Gu0x1aneqx632WsFpooBFYAAOOhWgUqVegECXj3BYBBLaGexLRT1OQSBJMkJVnOP5SskgzUeokeQythXA8qUHhON885m1YRl3xTmyN2iyFHYn8aOROHPBrwe8/QcG6XQC7HBv5RDPqy9SbaM53Pcd5y/l1cUYyjzWhOOkDvbMb/JdD0q/TvY85MQ//zbaefF99eDmI6lD6VgVZ0VN4xLk0OJFd1+qt5mW8n1LFY0PnixjzHA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:37 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [W82n6WXwrZrRfEOuh7cqFiW02DTZhbSs] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d6cc84d-b4e9-4c7e-3c1e-08d97f799e12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WA2tgwuLJIiHMjGr9JQEv4Z6SWI85Yy5DsQ4pM9ZxLEtQdnaNzKc1t6VTOV4FDAJOZquCM7leFJ17VRCCkz5buOwZzLIi/k27Ek34mkKxyo45+HymZuqzEcKLT7e4VlIoYysSkZxuC6H0g93eKg54zdjqYBBj8VrtwjJG8OoojnssaA+psoR52ZYvS8kJt+6thkSZWrGGDe+ic+meTNoNI2nPiDFHMr9SQC4pxR0sgoO7mHrZNtHl/fYFfjj2mDDbBl9ain6beqLihwvPwMEYJnCKeaEOufQp5G/wDMk6KR/AxUAPYmnaKC4uk2WqP+Sxa94cqhj7ZppXbthhJBTM9wrHmwLdhVXV+zlmkPEZjRyJu8bJOP54Iiuvyzz58DKBZGHagAJHdCjTdX/N5clHKAOOR/rVuomkqMuQ1+KnZYZOztaXWF9jda2DMd/D8eacUWDajLyfSej+pIHaJQSHt1sbXwwur/mJzW7K2mdlbZWhfoMZ8h7HkyMsxngP2imSgbCC91F9N5/uT85Y+VMp+lBuZZPutEPvwf3fyOkhKAF+lDkO8/9hk5MJRD0cjWvrSv6HdnGTy/bV4cUhxEiVVPUdFaw38KipA8Ux/VKriuQLbiy9rJlETVNMTjyq5kvuhZgXJGEEzLaXVsOw9YH5UZZm8qxMp7om/tlcdvkuRjT05Q8HS0rfXPflZkJI1G0u4HZFphAj0jro= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jw3UoHUjGCKTKNc5AvI4MxQvfXDsSiy/aZNDoduSxVLcOg0F0fAjyPsAqfyQsg8i4qgs4yzEIvlrQ97om/q7X9QO0kS155DkChDzdasPMEG0S3tUx6Sw1tqZz2+UiYEXQgRnh0iFR+XZWVbPxRMml8nWOu+ADyp+0R9RXGND/QssaBycINz0cHX1zHbnGTxtq42j9YDalcSWUX1frI2GAn693a4vardgRo0wYwjOsBPsA3WKLXrsU08Hllqu5kILSCh0r5OekianRHha4t1Q7bxSP4Df9GtBvOVGL3vPVoDzZMutSdrs7eiQ+CJpINZ89R8dyKEBS3rS8m53OFk4Dd0oexnwZ0EQ/pSsQR7QxRT8TGUKN3T82fF3ixDiQaANI+dms2LYqwvWvjiZIJs8FLn/1iaPgVgGY5+z+ZWY7vn22MLwHABy4DWZaB4472Ac X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VPzkR1mNdh0QXWPGEVvCersikynRRfScCBni31nlq7D2aWU5OXjAQNLK9ZSTlQSiDgfn9obgt4jK+WVGEEVEsGc1YWNOJiC33qIl0kwQwnxi6BMImZNdjaVAoV7qvFYfZLCCE7xoJ6bORuO8EOPyyA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d6cc84d-b4e9-4c7e-3c1e-08d97f799e12 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:37.1681 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/tests/avcodec: Test AVCodec and AVCodecDescriptor consistency 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: VcKlATIe1t6E Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/avcodec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 22f308fafa..64940cfdb1 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" +#include "libavcodec/codec.h" +#include "libavcodec/codec_desc.h" static const char *get_type_string(enum AVMediaType type) { @@ -39,6 +40,8 @@ int main(void){ int ret = 0; while (codec = av_codec_iterate(&iter)) { + const AVCodecDescriptor *desc; + if (!codec->name) { AV_LOG("Codec for format %s has no name\n", avcodec_get_name(codec->id)); @@ -68,6 +71,12 @@ int main(void){ } } } + if (!(desc = avcodec_descriptor_get(codec->id))) { + ERR("Codec %s lacks a corresponding descriptor\n"); + } else if (desc->type != codec->type) + ERR_EXT("The type of AVCodec %s and its AVCodecDescriptor differ: " + "%s vs %s\n", + get_type_string(codec->type), get_type_string(desc->type)); } return ret; }