From patchwork Sat May 7 11:28:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35672 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2123182pzb; Sat, 7 May 2022 04:35:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8XGcGW1NNLeQbhlRBfAdSntw0UIds/rW/N/5d2pqvSlY41sGeEATmwXJH4J7mbNdAKYBl X-Received: by 2002:a17:907:3f04:b0:6e8:4b0e:438d with SMTP id hq4-20020a1709073f0400b006e84b0e438dmr7036108ejc.391.1651923330398; Sat, 07 May 2022 04:35:30 -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 d6-20020a17090648c600b006efac6c0b7csi8143882ejt.7.2022.05.07.04.35.29; Sat, 07 May 2022 04:35:30 -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=DwJMP3WQ; 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 1749168B4DD; Sat, 7 May 2022 14:31:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2050.outbound.protection.outlook.com [40.92.89.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 380FB68B417 for ; Sat, 7 May 2022 14:31:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SwWMBqvOndnYNFi04zFBHbWHGrsQQplNd4qyyqM+DqS16UAtdcHmPaGL8QtbSeQdI4CRH3Qy/sOaLAviBy91qr6S6rGJbVPQqHiJAEeyvBma3dQn47PXrXLF486iXJLkigpFRVGFCV/GnjwLAYzTx7FiT8V8wBtVL4RQWclsJd0sqEfuKo8Bm2pWwEK3T/gxAc+Bu6Ajw2AHDtfdEg6+E5gPvWMsmzu7kzp4WfLF/1clqaoIxIf5oUnSWFelnUinAA/yrkHHcmbnPZhurKwiUb78JJqWXbEx0UCU6WxBv53BYKL4DO5T1FhZf0WiQqAGnVXFoPk0QGZ0xoPa1yO0IQ== 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=vd6HIq2PtGf7fTtP4rIfuZu0hEtmXphym5DCC1NRTMk=; b=TBCVNv+mYK4tRMjuIGI76QSeNHEp2B+EoOzzxKxx0zx2YXtHwsuYI3FVa1+BWyktVd4uHQdISq3WytdFX/zhrF08OE/IXNDU73wb2IRSyPbJz4AueqyuPW5/pVs72O3pg7wU0EtWTqomYZ4ItPiLH9/TsHH2qw5ZoheozXNtmL8kcd4WUTLMUsC3OzmYKIvL2OjrT5DZTVTYrZ8VG0ICDaQ05fcm+rjKMP8PUNaBNIRHqhdM21cdxBKl6F/uiUjq1ENV1sva5vFnxqrbT4rUpFRSaIWsWYBTq6Lr3T5zPAe2kaAV67czvn20APmVWb/Byx8ywZ1smJY6rFgOEAsIYg== 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=vd6HIq2PtGf7fTtP4rIfuZu0hEtmXphym5DCC1NRTMk=; b=DwJMP3WQmfQA+X/5ssFcKxTvV8YLa8P89OJL6XMMnYHNHoJ6o+0vmPJzOQMYkWS/xbihagaZ3VNeWZXyYCPTZBb7CJEjBZh+9DI2bsTvYIGPB6bgmnNlxyvVQzBM35cVV6m/zUAgQReBvhV0xLY8BxEcP5z5K9rLZ4nfP7g/XPmkIm+xg7YHCNuJ/ltMhgt2VXVA9rM/XJEmpUQ3UcDagDIFPpXApQiQ0eRH5QN+Y18gqAnO+s87HnJ+WG8w3sMo2qRj6vnAWFI0O3FiJmjBf7/6cyS7CtZBAzL6Vzl2CFoYguNBCmItTPUn5jPOhVZJ2rjTAHdFrS5K5lMxzR48PQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3128.eurprd01.prod.exchangelabs.com (2603:10a6:209:c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:31:11 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:31:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:25 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [G525Q1HH6FzBf4ZouFCJPqhlt2B6DeR6] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-38-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5241517e-df12-4a2c-175e-08da301d10d1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItw++0heYnR/zZMD1MV9YHbyfRBFZTEEHypZnlQ2CvpSnjYrUcwh4SYa30fkMekQ5UZTP1/EJOLhcMxEjYpQfrCK/q26q4d0e4H0ew6dPAUH3vNd1LxyRHOYdv/2Zbyv1YvhOH53SPFGpQX365FjzYXbd5dyPlIpjEN4zAAJykp4WhvjKkPuIWg3b3c7bPBgkbUeUjAlHSu75A3SLw9be9ZQD2CBvpWXJ3ZTX26KyOFAg1+J50kO4x3Ri+b/DgSowP5xqIBvVfumCrovb0ygB2vK99lub1GPWKt/5C+diflIzu7KRTiQMdgy758yYrcUom9/MISCkuIrZijKaSJ72deSinfBWomCOhj067DD0KAi9OWaCMlItTe9vCL4YVaEqZScr/zRnTBqy5dJrITl9XxRsL572AcYFV7Rjv3RysH+w6msFtCQExMc6A/xp3LJBBp9Jo9q4cpCgAoxwuOKxiyjdFOyruS2SDWFfAqdKYY0W9dUWs2vWssfKckjO57xbYA5h1YTfEEC+7L7EpUu3TUnlCSKaFEYWl4dghBcCKgMCZYSqnNoCeyoqsIUMKQVpCNcHHSgyg7x0xbT25OKA3jdu50DDk2tGY2BMMCI7JTOjzPq5cfuPUuHEEb7BRf/jbU/oISyy/uYUA/72VdfskQd0vTvPFBcxUKNP9EPV76IBYMH6wXJDE4lrqr6BGLsgSSgGc0J0LMR+cO82iGoQ1zGVXI1lqUvquRA3Vbo1onrPg= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3128:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Kw8gWc7gMAeocvPp1AmhNMz53RSRxfjvav8G4WHcX72y9c2zIjwWD3FdyZi/w03QqnFTbshSzICsgQusrHPtRSiaVJOeIhdKHPVF+S5TFgSUKCrBwprDOcD/VeUHAaRiAUVVr5xEgVHp50JY5SbU+dLvYkvPw8DDgQE5oxw6A+g06MsjjH/lZmaF08mGzZOX5i+9FomAIcQ/0HIcBfqJjPHBUDv9lyZ/+iwahicxQWoArZ8bZww0zIDLVrBj3Pu7xBCJOzx3uu+FFOVaFt1J/ysJ1PNQcgXJ5mUBjtVyPgsTPweDIfE5n+2ZoqucXh7EXMx1GJEhQkB77l1N0cIAvNWqH8gXEk5xa5HvJh9wQ93fGQeDoBDB7JZcjeKK59hBKd2Mm1iD/bRKHnKsw4GWAJQHv89e0Av5+hosBCcc/x1vhxOPNdM8YkAoZV3+N5xfds8qEKRk4N4xgt6GnAYuYAHnJR0qlUeTk8pYtnfTmBKuUYIdk6EYKVg2wT9ppXmH7dYl2QcxUSU00mefhQt5FIjjwz1Mcd0ZKKTu4Ea+7ZyR5eU0qoPsmHXoiD2R4Vaqrd5NI5dJWlyj/yV4b/SL8+9c8/wEBENVqY1dqrQ87iWNMORIybdsMF1eO3h1aqo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yfqYg8Cqr0+sHJe0UPfYI4DkysiTBfG5M0r6zgVSCQ8/ibBvhUX1kU6a7yjPYsX/5tKgN7Wp+t20uBrOIDlXRWlzovPO7mXPgMj7u8dPsNAZ1geHvdQqRgRWRkaaD6txMGL9vWpUr1o1rnM7pWKjk1cUJxDbSZmL/m3U48OywB4ghUPrPnOz+stBe7C+6i0iXXa8dNNd2ZVxXukbliAuMt9kufMNq0fKxpsVYNL94ld0UrCZ2V4tZCjxKaQ5bm7NIEWCaBtZyb3SauxAtMCd0zmqZ4u2bNmVc/kNNRIBK8nUo9Z/yd+TBHeNN8/GVYalpCqGHQtpDugw9TZdUmdh2W0IdScg75fgJaImFeoP0bkktZQXkaub5UH90e38iuqd0csWlLBt7jqVJHa+DrcNg0jylLT8QJ/U0gCy3wVbRDQEc4MoStpSjELXgSQm+lUnjrY1780YFYQQmpd5gafVD9Vz9KM24TpMt7nlwVD303pEuXqPdLneh/Kp/A+mDOaDiTvx16eBCGeof6zK5vGHfjQqVIbi95L/PMVVYcYsFmWYHXl5M7fibqEMbFLJvV/ovJoSlQOV6XuOnuPqPREODHpG8cWAPYJ/Ie27cJVJZrOifvHktT2Gw3p/1LCdyD7HzX+F0Epj36aRxqyIIqJlQk3qhNc8krAmyvbE3abkGudZngYSjFGlot3rR7cNd6xVIMeTdbQPX0Q6/+UUR3hzGz5Gim8ZH+dlWLtAHsSsgiikBvHq5IBZmJ7EGPrAZ3KoFY3oSv85bbsd/1veSwvrgFLMFb6FdzC0wVH+yd7+6F7IsRILSNLb8QNBu4F58lpYH4T4FI5XuxpvqJB0pXtqOpeNfemRMJQyjS8IGSnU+pyQBs2xFSkYfLM9MHyrh3MTa04wT5zSu7WMTt4Iy6skAPP8yahixYiIt/NUkCBxNOirXO5ADuAI0KGRMh5XIuCeo3eRFS3bm8Telhg8N/cSRFkS+brCHA7lsFccfhYVZMm/s1B8mJHZ5NX9hDyUI3yl/2uQjJN6G4z3NHp5b7GDBa0+zUQMZE+TFkCeSXJ4KkOkN5ZfgTriB1a1ENkzIHKmXrhmaX9zv8Qme1tzfLAJwcOd76K4T+u6b9j2gF/nBGKIcZaiEhOHfpy1yc58Ncbt7GGF3p4W4mnieblLNfHLBbvmO4fs8cwgVqq2/V3VTn00xBlIaJSyIQ2ExDjGFXchZ/jpIZJb6FchTfMY2LK11VdOUcQzPTEFBzKp0XunzfXfpjsRyHSw4oMBX5F7/aKzMqfvt1jAFDlEvFQzn409u1Wpnzxfni5fI0TaeZ0AMVFoJVdBbbMsiuRYSfHcKY0k0azPjvWO3qFujbr0XXnFg/+XO0Db1YEe20xQMFHDdDYshenWuXq761n/pWtcnLZpW6MORbsDkF4DviXp3eCQgo/aUHZgMascyrRp8DmWdAYap9Is6pqO3WakgVkp5yRz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5241517e-df12-4a2c-175e-08da301d10d1 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:31:02.2544 (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: AM6PR0102MB3128 Subject: [FFmpeg-devel] [PATCH 39/44] avformat/utils: Move ff_is_intra_only to avformat.c 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: X3J/3LVqm/3R It is an auxiliary function only used by the generic muxing and demuxing code. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 12 ++++++++++++ libavformat/utils.c | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index a828e6db55..eabccffcb0 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -30,6 +30,7 @@ #include "libavutil/samplefmt.h" #include "libavcodec/avcodec.h" #include "libavcodec/bsf.h" +#include "libavcodec/codec_desc.h" #include "libavcodec/packet_internal.h" #include "avformat.h" #include "demux.h" @@ -679,3 +680,14 @@ const AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, return avcodec_find_decoder(codec_id); } + +int ff_is_intra_only(enum AVCodecID id) +{ + const AVCodecDescriptor *d = avcodec_descriptor_get(id); + if (!d) + return 0; + if ((d->type == AVMEDIA_TYPE_VIDEO || d->type == AVMEDIA_TYPE_AUDIO) && + !(d->props & AV_CODEC_PROP_INTRA_ONLY)) + return 0; + return 1; +} diff --git a/libavformat/utils.c b/libavformat/utils.c index 68ea1d1050..343d8e7374 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -152,19 +152,6 @@ int av_filename_number_test(const char *filename) /**********************************************************/ -int ff_is_intra_only(enum AVCodecID id) -{ - const AVCodecDescriptor *d = avcodec_descriptor_get(id); - if (!d) - return 0; - if ((d->type == AVMEDIA_TYPE_VIDEO || d->type == AVMEDIA_TYPE_AUDIO) && - !(d->props & AV_CODEC_PROP_INTRA_ONLY)) - return 0; - return 1; -} - -/*******************************************************/ - unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id) { while (tags->id != AV_CODEC_ID_NONE) {