From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A97FC447B1 for ; Sat, 23 Mar 2024 02:07:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F02E968D5F7; Sat, 23 Mar 2024 04:06:55 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDA8768D5C9 for ; Sat, 23 Mar 2024 04:06:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RYVvA8U8sn2ALT9QIwNmBEuLMeYpHnOGWflTcNwmFr1E27FkfND5QpuGr4/pxl+MhjVp1RE1VCQRBMqyPfUZP45rELxLVy22gFmsH9eCn/xh9a/Jtuz4B45QNG0T5ODcMQGF8rYZU24/KCKKD/MPllq/+/SsstyHiw3GSoRl+Gb8h/H7cb+1NUzbHaQO/MI0O5EMlEluISPUdq3kWJZO0Mnv8K+CgT7ne20UH7LYcz46iG4cM20xCX2C6k9+FtQ3W6yeO7QU20zBy20h3HnxTgMHd5wiRpoUJG8xyBFqylMVcJ38TqAZH/BZQVWRFv8lVDsGFMx3ETvuaLZ0p4rBoA== 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=bQsONzj8cSscyZevlkKpRMkjsCFDPmzigQlv0F96nQI=; b=HJQvblR1MPqp5Xu5BmW5AusIP5JiG0SGFtzErp5YcT3vVJHjqij9UhnNyC5qedFtvXNib6CznRfURGIRMo7u6mb8UimSV1xlglx6HWFOJnHkm3g+au+VHTd4gd4TsXndmakrYLkS2Gvr/xA0gXn5C5bRzZ/BAMET/XSeHleouAlEJTVK1C5xqV8M9IV4IiTv7iRdRNrd/rMvXFFePO/4bMZDZOB8OsOCob6R1uElGIJpZEee9JprIhsJt37ZT3L+JB2sLYxlHDh8jfD3EgYnaGoUX5RmfsKab4/s6/qCUKZPa9fjQWR8VzNrDv14Q7JhP83iNDxdx34KEIuprOWveQ== 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=bQsONzj8cSscyZevlkKpRMkjsCFDPmzigQlv0F96nQI=; b=PFIApeYiPSVGdnA5rXXxvdfwxN3WQv4/eim1/jSSqEInFfqDyKCJHUsz/17C3CZQKzyrwcg1kbP358g9w5hovXpCnrIFI+O7vJQf4zqac7PoT3ytsno4Tj/loJahFaJkJ4a8co+mYmerpgkiBMkaGyGfNNlr8kC1AXydXQ2y2U2jk+V3Wtz2p7zi7ChdpisgsXenp8AjDKBsQWY/eFGwQFhVlcJHqR9kcNh7uyapP9RkvZX5S8BHX0Gj0GgnWfiI/NSZ6hcszdIXi0beeCym4ceU4hDmIfBI92F/4po+Km0kMRSuG0rB+M6OPkj3v+3MIhKwBbR8FaYWoGI0Bp7/Xg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Sat, 23 Mar 2024 02:06:40 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 02:06:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 03:06:17 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [YRII/D43XXcYX54eKfFj3wBZ12fVqNC7ktHHukqrsds=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323020623.1570961-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fba14e8-5fdb-42a2-da21-08dc4adde0e9 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3AS3pGvEfQnJuROrbZZQ4oP89ROaTAofPVr8tklBmLqmncw86TqBr1C0UvGfF+iOgj5TzMRYSICc7f4bx1gpcHhFMLVXr3+x5CmNgX+6sHHJg7Dintc4kwwwI+lo1EQFy2Sr8VtuHzM8AZBGSD+mg04phIK/G+W+bvjbkCYVJPmnH/sqUqGbJQlnm+P3H2JEdXLD+3tGlZ3fJnJROOJ9VTF+jpO8uyisJ/wfjZIli8pKbIkZ+O/1Ucoh+rc1utrPj5Hv4Azf45QvUmSxEVXTELNN+X5+vD+s3V7HZta7AqUkL0aaMFaCg0G+gliwkqHxW84Mul97ZM6yoYgk+OqmFouHojfcPS8M8N1PJ9ESo0XcBpr8wVDNRJ9NS5moHwzhRbbNywol/Axe8sBQ2/wb3V5tBwy3T1R3mhI85Ig8eBnlGFp6biEDC8mSOhF7a/8F913e/Vu4l1Skz1wH94FI9ME5SYBcI6hJPfTp2x2vC+uzYsMojaqvJmSYjSaEu0sbSvTKCaEQ/lVVRxOUykyWO5G4SC7Ld1YKVdCmGDOMUdoicyusSHhfTBdQy0Kq6qczi1CHJv76h+j4PjU7RbDikctvDd8ymYpcxpaEPCsgTNdpdpEK24bQ+/QWdcrA4b8Av8c1eNvgp3TxqdMnPh9jjhy4Q8FWohlArxV728OJxYlqrwbp9hRraF4M9PFWasxiLcIE4UZ/Va6G0GK4WgGITbyLPX3DK6iLqAKoR/TnVk2oc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JquE1zfXU2d98I5mB3Aobj8636ByM8XtgCmemVf7I9YnRMbwd7JI7x99hVsBn23R1qvoMz887bGFtwE1aY92Br0I3riLY0bfIQquTRnDD0AoDDAxTgJBErxjwxJSFfbjkbH72HlbJnA68kuxcgM3+meLRt93ITkDhkorvDQyMx/b3VaDdkn2s0CZEEB/x7C5vqUyoHdLnBFbnl+mzwbCH2o0XGrxWdEbhVmH90t6UwBhOEJr2vk1yxNSDClcyLcmv40vq2VKiYUF85pFX7OBinmQHlb3cFHq3C98pr+UfJNR1PFf5wadAdnujciC2V+av5XlG/FWEVrOx/zoPbA+NZ9mrIiveJbfltdJFTAUX1OA1QV30BhSj6oZwnHy7KUKQO7BLBqIOn98CpLgJhd6/shTHqdapaYaDR+GxIScVzYXZFXEQK4OntmsiTrW8Wr4LqhmvhU1fjCbdx/6BtPkTd1jqnLPW3VREKiABfiG75k1kDZKOrj/lkLbJCBU1EDXc+TxTnUhjVaIhrucCQlA6CZCq8eCwc8Uvt/vThdrMJsvpannVj6EZKh6Q/eQapsVbzXe+X9fbrvlhl2R6VBZF3AGE8Tj8tbq2CNeg8mVoDE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hxQBJNetvCQ6GbksWSSRXxaZ/agswL2izPIClOjv+Qr/ABwy90caAYshQZ8e?= =?us-ascii?Q?RjagEFxufgiBNjfAk+NNLCFD9rpJ9y98aXDgvkziRfmEzT1gBpBvsSvtJDzd?= =?us-ascii?Q?VWF14q5zkR6wKQBhAmyq0VUY8T6yxnDCzHztzd2V/bahs8UMDajx1y4wOg47?= =?us-ascii?Q?WNeOMTKfbarXnmRo+FvH1gGOE51wZYTrOMMPl51NKo+hhyZRnYbb4GWGAB96?= =?us-ascii?Q?5UClutdlrLdI52riWJiDLTShauA5rldSO6ZCYhqBXOIsOQtyLAnMaCvEe85f?= =?us-ascii?Q?M70Wkwm5P7mXO6c1zprDCV+l5Y6iIBoCOCSs78aC8etVTX3JcbfPY7G3NQm+?= =?us-ascii?Q?ceFq+9sbR4bFHb42EK/dpDf7intm85rFkFoY+AdrWQZqsY/Uq37aZZd2fuCV?= =?us-ascii?Q?BsiU9eYaFFGzSnje4OCs+6eaIWAmkynuTzOKr5GEzRMvBwFBZ9ePBktoieCO?= =?us-ascii?Q?I3m1HSJjEUNocsWuytbganSaoMgTHVXxcwHg52HDPmHKV2I3AYuOV9GCRC+c?= =?us-ascii?Q?0QtrH4UrsmWOOkS9yQvfKJ2JXIgLw7VZxl32Z2zIYilq2ovNcNZ7GVpLTry+?= =?us-ascii?Q?7BaOL++8lQGSreSCvc6P7P4riCyhrvsavywU3M43/exThisFNhmPp8bgbg1s?= =?us-ascii?Q?/OyP+lXAJm5UfPBiYBfbAfYjktRoL08rH3L2FG6luzgWIrFNNq0b/Cn4C5Ii?= =?us-ascii?Q?CG/DPojWttkLpE/uNCvLf7FSfIelnd+62KhYqjXsvWrAhD+mtiJYGCW+yrgm?= =?us-ascii?Q?DJ0L9ZW1rjsixVshY6I9fRKz+q8ww8MMnv/Z27ZFt21zXJG/fR5Tn2dDQhb6?= =?us-ascii?Q?hW6tGbYVzk6qm90laRGei/7Xp4wWcqLFAP+xQBjtKVz42kVeltTUdLZ5wpAk?= =?us-ascii?Q?M6CMeH0qOnz1Mm98BsUEE2sh2Y/s+Dc3G23PBcrO5MN18ZHebIdqlUk1EdD8?= =?us-ascii?Q?xKMiQZeF7Nc/dct7BaQ88v8gVjWBbEERT+KG7bEQy09rawjEihoaG8FDZdKg?= =?us-ascii?Q?rAYs/L6W4RfKs3BVvPtjqrZKn/cdDFmrsCxvX3TfaeIdM7rVBv8WalzEQbYX?= =?us-ascii?Q?zmDCEwrk4xyEkEj3k/LKpkXoqAgZNquZNuB6R0nrH1TmD/AvCMTI+Tbo1Bpw?= =?us-ascii?Q?mRCLV2mEIOqFWh79YvCitGL3ABxF1z9Xip0e3OeIdockEKdMNJ22I3Rczwuk?= =?us-ascii?Q?VgIVTc5KbIJAvD1XZtsnO10uhjAyXgSOaQqlYXNP+8J7SQZEPY9IpKdM58+j?= =?us-ascii?Q?Go3qldTBgIiWx0pMfYdKyx959N/gjWY7BYKFfFphjA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fba14e8-5fdb-42a2-da21-08dc4adde0e9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 02:06:40.3741 (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: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH 09/15] avformat/argo_cvg: Avoid relocations for ArgoCVGOverride 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The average length of the strings used here does not differ much from the length of the longest string; therefore it makes sense to use an array big enough for the longest string and not a pointer to a string. This also moves this array into .rodata (from .data.rel.ro). Signed-off-by: Andreas Rheinhardt --- libavformat/argo_cvg.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index 5db2a85dd8..03ae6fa59e 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -47,13 +47,6 @@ typedef struct ArgoCVGHeader { uint32_t reverb; /*< Reverb flag. */ } ArgoCVGHeader; -typedef struct ArgoCVGOverride { - const char *name; - ArgoCVGHeader header; - uint32_t checksum; - int sample_rate; -} ArgoCVGOverride; - typedef struct ArgoCVGDemuxContext { ArgoCVGHeader header; uint32_t checksum; @@ -72,12 +65,33 @@ typedef struct ArgoCVGMuxContext { #if CONFIG_ARGO_CVG_DEMUXER /* "Special" files that are played at a different rate. */ +// FILE(NAME, SIZE, LOOP, REVERB, CHECKSUM, SAMPLE_RATE) +#define OVERRIDE_FILES(FILE) \ + FILE(CRYS, 23592, 0, 1, 2495499, 88200) /* Beta */ \ + FILE(REDCRY88, 38280, 0, 1, 4134848, 88200) /* Beta */ \ + FILE(DANLOOP1, 54744, 1, 0, 5684641, 37800) /* Beta */ \ + FILE(PICKUP88, 12904, 0, 1, 1348091, 48000) /* Beta */ \ + FILE(SELECT1, 5080, 0, 1, 549987, 44100) /* Beta */ \ + +#define MAX_FILENAME_SIZE(NAME, SIZE, LOOP, REVERB, CHECKSUM, SAMPLE_RATE) \ + MAX_SIZE_BEFORE_ ## NAME, \ + MAX_SIZE_UNTIL_ ## NAME ## _MINUS1 = FFMAX(sizeof(#NAME ".CVG"), MAX_SIZE_BEFORE_ ## NAME) - 1, +enum { + OVERRIDE_FILES(MAX_FILENAME_SIZE) + MAX_OVERRIDE_FILENAME_SIZE +}; + +typedef struct ArgoCVGOverride { + const char name[MAX_OVERRIDE_FILENAME_SIZE]; + ArgoCVGHeader header; + uint32_t checksum; + int sample_rate; +} ArgoCVGOverride; + +#define FILE(NAME, SIZE, LOOP, REVERB, CHECKSUM, SAMPLE_RATE) \ + { #NAME ".CVG", { SIZE, LOOP, REVERB }, CHECKSUM, SAMPLE_RATE }, static const ArgoCVGOverride overrides[] = { - { "CRYS.CVG", { 23592, 0, 1 }, 2495499, 88200 }, /* Beta */ - { "REDCRY88.CVG", { 38280, 0, 1 }, 4134848, 88200 }, /* Beta */ - { "DANLOOP1.CVG", { 54744, 1, 0 }, 5684641, 37800 }, /* Beta */ - { "PICKUP88.CVG", { 12904, 0, 1 }, 1348091, 48000 }, /* Beta */ - { "SELECT1.CVG", { 5080, 0, 1 }, 549987, 44100 }, /* Beta */ + OVERRIDE_FILES(FILE) }; static int argo_cvg_probe(const AVProbeData *p) -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".