From patchwork Mon Sep 4 13:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43527 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1219817pzb; Mon, 4 Sep 2023 06:43:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqaAC7XKAq/wn5N569bGL1texaZu7CKtN9pUOcrZ45aNlpW9xD9hh1egn1VHsi/oCKS1nA X-Received: by 2002:aa7:c909:0:b0:52a:47af:97a4 with SMTP id b9-20020aa7c909000000b0052a47af97a4mr7996805edt.5.1693835028859; Mon, 04 Sep 2023 06:43: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 g30-20020a056402321e00b0052c9f89444esi2887358eda.47.2023.09.04.06.43.35; Mon, 04 Sep 2023 06:43: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=DxoZzoS4; 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 95AFD68C4A6; Mon, 4 Sep 2023 16:43:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2035.outbound.protection.outlook.com [40.92.66.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EBCF68C4A6 for ; Mon, 4 Sep 2023 16:43:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ALyUR1WYar2sxmagdDgPwLBXKp4/gcQ5Mx7vEZuMjfp2gYwoiuf2Xkfh9GRidXM85BEVYF5asL9IyiCT7QHfxMEs+e+5BEKhi9pMyWRpRmAANyLxPxmTYlrR/eEyPeYDMVW29WkoLOmCNhp4yviiVjdb/iGKIpyenYIt76bihsI7Jj5I8tXZ6edPftA+Lru1+o/rimEZmVw//4L5U8egjoutidv1pODtGNvMsd1sH7zE+7WCCPE1EcivoUpL/TtxIBd13nRmlNMzac29RAwCdm3BoQSHh0qk19//bXNY/9tgQe3xnD/IEZOyo7vQcT2g22wRH/tdbuCJRn/VaxzQSQ== 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=P6pSYXxS1NMYzTASZ/AD3au3ii/cZRcBCp0qhZ0MYSA=; b=RhrBXg6vbNRCHvIyX7STayELHTJFDyqrdeVswSWsOQ3GvGqxxf2mriGB4kOD29GsRyMbVhTPA53bajyGpuiC7C4cjG2u9M73ZlEqKesNq30+2j+zlarVHtfyQNFwujSrNSCOyVNZBNPKDW3rZQC+6gckZCQpKqZNtiGq73tMDWNJ/ruEA71GYNHd/RDmR2549t5xU307HTm+WKalLaDkZzC/rGm4NErNAxIn48hp0AYFzBlYqqqIm/tmNQUoPbEL/AMpyrLlrLdgKqtW2dHe240o71sbtGPSc2rxPUmDuogQipK4CVEzWW8eZSldQHGpBYKNcKP/sULEUwc9KdfkNw== 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=P6pSYXxS1NMYzTASZ/AD3au3ii/cZRcBCp0qhZ0MYSA=; b=DxoZzoS4RFsI02JUaKGLsEEG6dxfcK4AqqqNrrGaQuBMgzETLfTu6EflWqZUA+WG4ieh0GdaLpctRBtd8VDEU4X/Jl+FcdHFUOFz59HDgczJlSle7k76d+wYIgL+SzMbqkmW8BYw4/hbz8/12EtK1FmS0x1rMXHYx4IvUFnd7nVZqnwcY47GGYYBBqtR6qvcbnU9E8f1ehBUVbUxLJEWrig009ihiGbdVlhW6aXaX4n0MzVud3F8/8G1b5PFmV83sAuuBNao/1fBa0jOt6wTSXE/4fozaf6qSWymgz9jtzBpf/Wp/4dGyFwvtt8s2tI7YtvX0YUtgYODuHkUYqQUQA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0400.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.30; Mon, 4 Sep 2023 13:43:22 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 13:43:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 15:44:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Un6qiWtYRNzTpOqYi+U6cLHpLk1mediZKEJPjCQsfmc=] X-ClientProxiedBy: ZR2P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904134434.2829345-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0400:EE_ X-MS-Office365-Filtering-Correlation-Id: 66350532-1937-4265-8fcb-08dbad4ce7da X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgcVwb7bYSzvB8RifUaOkQXgOMr/JncI826Ov0i1Zrebs30i7hVob58w2Z0CPxbPrR4vijWbb9AJJ6NlXya9SgW8u2igMT0i7N8AqUyJJHsj4jH4Uk1TP5ITqbDYqB6l0cR3NsuJCLFW6YgGXazx7k/sCFw5LU1VaX+SRCnFXgUE/EzERvY7NOSSVCIglqdRUGlgvyEIh2Bn9Uck1nm4qsSXRqK1F94LkBeTtMQ/BjCOvWLdU/+RWx4m5PKmtgs2muwHpSlI4m4WtOprleZxqyiVwvyLoA01BZQ7GVq7KcOpUjVpc4FzKn/ebMvzVpRJsFIGeqUZU1OFSMukVQtMQno1+FOUmHmyL/OcRpazEYJxdld/i6iJfaO/T5Ho5/EHRoBVY5F1lJcMy5e8POFzCbA0rzQvtnjVvJsxsIllCj0PxBsa42zOF0mn9mNh9Pl2NUtXP+7kdyf3mn/UppMBgWUjKdRrOtyCMntO38lD1Id8HBWK2fgDqjhmHL464x4TqmBEPm0CzSFbtcD9N7vUJ+RrGXV7CWHXrr+WY9ukc7xyN2qTHNqdiaHcJ7xIQLLYvNxB5nZzLDT3IIp7yOjzDUfkTKdwsc2TKL4hgDg8JEdFyIk0Cneo8+P4VWKqzXN0V24Z5f3/McrslEnoSrrWV21s7CN0sNfoC1kPaOTySaJOqrfg4SLzOxHTE4kRAnqSSjzktM5r6OWLMHCiOo7Raos6MkhZBtf6t7spbbzqbJ/gAl09ZXq2kcRk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pwZ2TVMmsjdCElI/ByTzgeqverrm4qLNHRfRUIgcbeO8PLqHVusbxfYMJG5uaRh8bFPbRWmt3ophdSRoLRdsoVyZtrnYI6Pfls5/W44YBeYb/xjH3Z5uIAorxWhVI1xN9jiqlGt2GuGMCibOVp+KkpKHL5KwKJlJSwHgRsRVphvByk6wxW4XkrV2rocxs6zRvxvlSm4pIplqZcGfxsVGoxz8Co6lQhUm0m7MyJoztDMvteiPmJCo2qy6ZDunYOohzcbUXBGyzo4oY8v3eM22cxskUmyAXT8PUKGYHGZP0QE/AoxD7c5Df57ZT56rGxAHmqE0HS0VFyyzFDl8lEjY2sDlAuC7ASz1hd+Ug4Hn431gVDgaZRtYz4egHvoLMDJqDfCM2QW6isTEGldkItj7vWHbItQ8PQj5gy1q37jg/bMhZ9u+A2XKwnRvoKHNwru6MOsCui317diTvm84egLORPTl+0QPrO5Oim0S0xJmOfP26C2x8CbduCXF1CojJYU8eUPRhlX4xyEvyUrBSQSYVggtNdmctTB5jrlw0zhaPgcd6TdCyTM7G7vnbZJ32RtRSWXp6RXfF6clI/HVDAC+UkXktPCGuNnB1tumduC0T53Gr6fYkaNBbh+XtyXXvVQ/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UzGww3hXUBxit+TSQKategZrPazUCvtG957nQi+6Z4GtoUJZOg/gVsxkPGMlNu6C4Doq4IsJKAUBPfI5ar1GGHi8/i2COwROlxdlKGHkQo5VHhrpM8HYQ0cn0H1YgRgOM7O0HkZNWtNnMIxxkVkn/T+dvF8jBRG+llj4Aqq3pN1KB8cpjN6cYclHtSyQGdhNGnotEH1OqGCz7KjTo50LnJlt2HcFMd00TCPGeWR9/b1qUyUYvtu05f5fNe5J/dS7LI6HUH+vM3+k7roZA1lw1GtYoL9H+qt9FuwGXIU2EhYaSq8UHpBGig5g+mezzlblZDSz7zxLFBRH59QiU5q/IrcwQFcapZckNkqpcWTy1QitXAxMnmnFVFLfYMDnD9HEz7dlHUAiPtGPwGg9SCyqMHn7XhxGZDSHb9UvoK6BQwVAXmTUtws4blCNWj3AcH+gy/3SWDrIeRsCxiWZ8rspa+dI4VT2MeERT5L5OS4OSBUwiKTtIxMyHODh6/2d0Pq7+ppg+7DTZTwpPUXfTJIphqNf2JXjTqFGJdE/EVVKkCuHHPtOi9B0EUY39kHCtAk5FtvKSQQnGtc1dK74dHIq/pzfiv6iPVEMNrxkuO8ldOUBKqS9PseTaqUw8Zf2y+rugyldtxRhGb/fIokMVRyK9ea7Gbkyx68cg7Q+so0wrycUxagbwd7SLeQvGRsUqSK5l2tcYuB80iLkxzKfBkdOBxL7O80nJXpTzNESnGXwat250KH2T7Bul81BytFliAANMSog2qpga725cH1X2owLe0RRyGhPtCa/0DoGlNzlQNcvsuq7riMTt5P6lc8iS3Zkysr4GcoU6FsUibf1iBXat66d6cgTMh2upi87/kWmAb8ULqRwNj8mNT0ehP6ewR84XZQ8Nh1Gh4AGjVAGXfSl05Fr+rgZ5VGdIqOQcvKfxiPWSwoXMqxg8fGSOJDjegDCcnxvHbnNeFrFZJTpunuk5/sDO6DR2bIFgFnVOIZSp1gvJQceHlzqlgi/54TsrfNTKB9FIXpy4b7NqGpcDDdRt+D91UZKBfj+4hFaDqsq6xOC08HLoLDYVd447XHZVKSoYOVKo8WS2a7IWTGgqOIbuUWyu/tWObjPjEG8J031iENN99LlLnYlWPaW0XlpXYJyMejfNKKnpjVS/3EjiBLiHS1m3YODZfq//eQd4vA9LlmhNhjTrK7Mb/6NVzohO2I/zONFqAZxAYyud/jm381OMRw7NLqwu+mgkQsbVTOGgt1jybCeGOxi3iJl+w26qyM4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66350532-1937-4265-8fcb-08dbad4ce7da X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 13:43:22.6429 (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: DU2P250MB0400 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers 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: Aiw/wUdBjC/S They do mostly the same. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 3 +-- libavcodec/parsers.c | 3 +-- libavcodec/rv34_parser.c | 16 ++-------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 08fd151619..bf3b0a93f9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \ OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o -OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o -OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o +OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index a663b9e253..5128009cd4 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser; extern const AVCodecParser ff_png_parser; extern const AVCodecParser ff_pnm_parser; extern const AVCodecParser ff_qoi_parser; -extern const AVCodecParser ff_rv30_parser; -extern const AVCodecParser ff_rv40_parser; +extern const AVCodecParser ff_rv34_parser; extern const AVCodecParser ff_sbc_parser; extern const AVCodecParser ff_sipr_parser; extern const AVCodecParser ff_tak_parser; diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c index e17bc8562d..fbc764c64f 100644 --- a/libavcodec/rv34_parser.c +++ b/libavcodec/rv34_parser.c @@ -24,8 +24,6 @@ * RV30/40 parser */ -#include "config_components.h" - #include "parser.h" #include "libavutil/intreadwrite.h" @@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s, return buf_size; } -#if CONFIG_RV30_PARSER -const AVCodecParser ff_rv30_parser = { - .codec_ids = { AV_CODEC_ID_RV30 }, - .priv_data_size = sizeof(RV34ParseContext), - .parser_parse = rv34_parse, -}; -#endif - -#if CONFIG_RV40_PARSER -const AVCodecParser ff_rv40_parser = { - .codec_ids = { AV_CODEC_ID_RV40 }, +const AVCodecParser ff_rv34_parser = { + .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 }, .priv_data_size = sizeof(RV34ParseContext), .parser_parse = rv34_parse, }; -#endif