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 2C96145AAB for ; Wed, 14 Jun 2023 10:08:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AA4768C414; Wed, 14 Jun 2023 13:08:02 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2104.outbound.protection.outlook.com [40.92.66.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90D8168C085 for ; Wed, 14 Jun 2023 13:07:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c55XHKaZraCymHRaOZWNM7B7Qkg4vZhab9OdMR2CGkIb6KbzowlnDEK+dcTn7F5IWOnEZZSkdy19Icd97w3giA9SkaXgvY1Ns7Q8EG9N4Dp3Inc24Ba9Ti3sLk35UGgmtCHC29DoER3lBGD3iPmOHINQcgH2f9XT7m5mfHGpQZ/PF+NPQWUvgJ/jMWR/g3WUSiNZw4WuRmU05i/YBe6Df5Ejb+t2yRard91c/ZW2iecq1AjNkSJdQ3B6X6ykf2E5XYGoM4uSfmiOOqc2T290JxX8CwGcVZu2ANosVK8asltqo9AFqq7i45JdFS4e3TYuqsHmTx+fiupdVdw6EwZv5A== 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=1BBywjek1mzOHc+VWt+7gAlDtQrDmnWq6BhgK0kThGQ=; b=Pk41frES7aAw8OCBEgrklxMSRMV5ycwkwsDl7hk+TxnKzWBw9+e8scOIiO0jZcJE4UqGWXLC2GL+dRjc9W+B4KuMigVH4LTQ0D6xXAiROK72hc5QSm9TJD0p5vPusHTZSwR8LNgEBkNJgVwKG5jX3PEnILgXYlG+7cXnxItKuBvqubbkBTP8eDUQC/J3m6UsVt+7W5+5u/8YIHgGd74az+94NcvSKKcfn3C/l7xzgG0fc5caz7/ikbY0eGgljU9RHnnSNZYxDJwbw/F7kQVkmey7hlfaESxeQzx4IpOo2rC1TeTR01g4ws80KaZHX8UsBI+dIrZJwpje/oCoiQ+kwQ== 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=1BBywjek1mzOHc+VWt+7gAlDtQrDmnWq6BhgK0kThGQ=; b=t1aENHcSkm/QzSSoxxJvGYTFbJG7v3inlLFdlgwqCRp+O8EzB3Lxk23L7MRgYXgmGWhgL9/714mDVPOrjYR4J+Z1hjNQI7iMnq0zXBv/8CoGkOj6Vkj3rQq7rxS3WLOFv5FhjsvsNPazB1EFlk+8QLAfIHcaQR02Gi6XGoX0ftNf5VFOmR1JgwAkTdilp7hV9yc+qi5APYCVFczuzbKVuyzl3an/CUlZLiN6SagY+CyVZ4WH1LXRjh4j3oJi2d6OgekVDj2ZkmYf8AbIWCqMGTdJltdcUGV8cYWt5wMuQGgOL+T70bIeTonpdMDoJzrgsDIuS9DGJkcVdkCsyi7jOQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37; Wed, 14 Jun 2023 10:07:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::6328:a667:5a29:f1e1]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::6328:a667:5a29:f1e1%5]) with mapi id 15.20.6455.045; Wed, 14 Jun 2023 10:07:55 +0000 Message-ID: Date: Wed, 14 Jun 2023 12:08:43 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230608142029.16564-1-thilo.borgmann@mail.de> <20230608142029.16564-2-thilo.borgmann@mail.de> From: Andreas Rheinhardt In-Reply-To: <20230608142029.16564-2-thilo.borgmann@mail.de> X-TMN: [XhAf9zp6kuo71pnwO4MFaYhUnH9TN7jm] X-ClientProxiedBy: FR0P281CA0234.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: b24561a1-2241-4927-3397-08db6cbf38aa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X4+FaCv60+IV06+0WkSoYAOquHYaQlVtbgQfl5KgAuqLja97jbdZTSRNFNdX824APzKlWUZIohTqI9C+xGf/IeFBMS8GaLXdKjbCq10yOcff03mdsSeTylb2H0REFiwBcgYExe3GljrxgN3+xcItNMpY2C0X2rxOQVhULNAzcPBnA5RBiXY333j/EwHj1YvkQKG9VfKN14Qdafe20YI7UGNyDU8F2fNhFt9f/wF2+/BavdZXvJTw38Js3abs6c1rfTLT+LQ2bjpImYhQFRusN0D4XpQbibijWTjjGeUfg2s8rKJz5buRQMPm9vtgMAp9P6UwQtUioaavy3h29p3ft4pftceizEFTJFP5M8dbzWc9i+xI6zCeFAPjl0afWNxGQ5AMgVqRrMi0xR/LQVTjHBkXvDdT6LRroaDucWXvLwASw07FUqzKtElsNtKIaiHMZeovdsUYAHF+8SEuRqnLvo7G6ewvG2Iol8tr92/U9JMCG1OG1mj5uLdenKo+brB5qloVQ6Rv+8piHzdx9E+jmIEeapA0bXQBNyrwu9nGG9k2fcQ1vfXSnbY8cLaxNlhBeMBJnkjfdqvHIB2CMFiimmXcFBllwFV5Iaxqiayrisr/Jj+d1I/2tSFsT6aoF98H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OHpNQ2hocnVQbVo3NzBhMDB0WmJZNG1PY0ZoeVdqUjZpaEhTd3NzSVQ0cmJw?= =?utf-8?B?dlFPcEFKeGpRTDh2YUNRRDd0RHViQUFRb2hIR1ArRERqOUtmTmZ0UFBtYzNV?= =?utf-8?B?dWIvcmpPbkpaSVJPY2lPekV4a2lqa005LzNxbi9nMmdtVFBjcHZ0RFpFSnZZ?= =?utf-8?B?MjRSRE1USTlEcGZkKzdYeHdEbGJNa0tRc2NMQURIN3FSanN0Ujd2Zno5cWVx?= =?utf-8?B?M3EyOEdMOVlEUmpIZ3BEV0pDeXFreDNwdGJaNWx2N1JQMm0zYVFWQXp6YWp4?= =?utf-8?B?SWxmcGxMNmhWNE1WUi9VaHdadlUxeUwrK1pzZld6MU1MK3MwNklpbjBON21a?= =?utf-8?B?OHFTSFp6UURFQXFIQW1oMGxCVXc3OGdoaTNzbnVsWE8ydHBZdit1bGNuSits?= =?utf-8?B?UlVSQmdZcmFTTFRGZ0FKdnVDa0I2S0dCdGEyVStNSkw5WTNnZXJjVjhER3F3?= =?utf-8?B?MjRReC9qcXJxN2dZZzhjMXRYV3cwY0VKV3hBS2poQStodzYrbHU0WE1NN1Qw?= =?utf-8?B?UnhLSVp0aWtQQWhtTU44VVZaMUxqc0VQdk1hRjkyc2srQ2h1MGxHSG5xVWhR?= =?utf-8?B?aWdhcDNhdElwRVlCTGQ0Z3ZiT1BrOFZybDlWY1NvdGZHR0lMT2tNc25nU21h?= =?utf-8?B?bktWMTQ5Rk84QjkyWWluZGttNmRQa3hmNkJUYklncWE1aGZYKyt1akFOVVZq?= =?utf-8?B?QkRCQm1sa0NuOG02RG9HZjBKKzJCRnlRR1NkZlRabjQwRGcrbXlqL09ycXl2?= =?utf-8?B?WFlwUUN0NU1BeGdXWjdwdENaMTh1c1RqMThCb2Z6RmlQZWZsWW5YbVRxbkk3?= =?utf-8?B?WVJQQ2l1VVVQcVZubVNLWkJLNUlZREVnTU82eEhHcXMxOFZuSkxCb0UrR0Vu?= =?utf-8?B?endFdkhVTnF1ZW1TSHl5MFdLWG5hOVREZWZWbHRkTmhlWTN6VHFoTllTYjRM?= =?utf-8?B?V0lETy96L1hPcjh1MytDUjhSRHZTQko4Z01yaFdkQ09CbzVQVGdmaVNCQitC?= =?utf-8?B?ZlE1SUptSTJaM1RNYW8vVHJBZU45UHVmYUxJL1JaQ1ViMjY4SjRScTNxTmdu?= =?utf-8?B?T0N3U3ozTVpqTmZQRFI3ZlFZYm5CVXI0eUU4SlpDTVdZZklVNVVqSzdEL1No?= =?utf-8?B?SGlCU3NsVm5ENm5tdjQ3VW1icWRxWXpyUGQ3cEVNMGRRUnU4STZkeUJvQXlX?= =?utf-8?B?Unh3ZS9OLzlQa3I1bmZEMDNweWp6VEFPcjBWbWpkQnQ0ME9tMTFrV0kxZWlD?= =?utf-8?B?YkpTazZLK25oaTExVFdZdXRmMkw3Z2JHSDJoUlVBQ2JueERlSno1WkNtUlhh?= =?utf-8?B?NUM3Qy9NUzExcTRwK21kQ2FMbkJXMFRSOWxidFFCSWlrS25HSDFNM01EQVNC?= =?utf-8?B?clM2WEIrZzVIc0wxYm5ZUjdVZlhpdHZlTGtieVdNcW1NMjBMbURSc3VpRDBo?= =?utf-8?B?K3VDdi9wTElUNUVHMlRmS2tkbU5PWXJIcE1mSTBqYTlHLzdUM0pKZEFlT2d3?= =?utf-8?B?SmlhUGNlQWpKYStYMDdCZitQR2tKMU5hV202dUhIV1hoUUh6Y2l2MCtkUDgx?= =?utf-8?B?QmZuOWdTcDY2djhOL25lMkhoNUpmazdWQkVtVG03SXdvcldDTjRNQ0VIWnlH?= =?utf-8?B?cHp1ekEyY24rY1VLdFVKRjNvUWdmWkE4Y3hLbWVuVnVpeUxQYlVmeE5qQ3dQ?= =?utf-8?Q?G5awJcV/5POMEKJzTrnN?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b24561a1-2241-4927-3397-08db6cbf38aa X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2023 10:07:55.1413 (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: AS8P250MB0070 Subject: Re: [FFmpeg-devel] [PATCH v1 1/4] avcodec/webp: move definitions into header 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 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: Thilo Borgmann: > --- > libavcodec/webp.c | 17 +-------------- > libavcodec/webp.h | 55 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 56 insertions(+), 16 deletions(-) > create mode 100644 libavcodec/webp.h > > diff --git a/libavcodec/webp.c b/libavcodec/webp.c > index d35cb66f8d..15152ec8fb 100644 > --- a/libavcodec/webp.c > +++ b/libavcodec/webp.c > @@ -52,22 +52,7 @@ > #include "thread.h" > #include "tiff_common.h" > #include "vp8.h" > - > -#define VP8X_FLAG_ANIMATION 0x02 > -#define VP8X_FLAG_XMP_METADATA 0x04 > -#define VP8X_FLAG_EXIF_METADATA 0x08 > -#define VP8X_FLAG_ALPHA 0x10 > -#define VP8X_FLAG_ICC 0x20 > - > -#define MAX_PALETTE_SIZE 256 > -#define MAX_CACHE_BITS 11 > -#define NUM_CODE_LENGTH_CODES 19 > -#define HUFFMAN_CODES_PER_META_CODE 5 > -#define NUM_LITERAL_CODES 256 > -#define NUM_LENGTH_CODES 24 > -#define NUM_DISTANCE_CODES 40 > -#define NUM_SHORT_DISTANCES 120 > -#define MAX_HUFFMAN_CODE_LENGTH 15 > +#include "webp.h" > > static const uint16_t alphabet_sizes[HUFFMAN_CODES_PER_META_CODE] = { > NUM_LITERAL_CODES + NUM_LENGTH_CODES, > diff --git a/libavcodec/webp.h b/libavcodec/webp.h > new file mode 100644 > index 0000000000..90baa71182 > --- /dev/null > +++ b/libavcodec/webp.h > @@ -0,0 +1,55 @@ > +/* > + * WebP image format definitions > + * Copyright (c) 2020 Pexeso Inc. > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/** > + * @file > + * WebP image format definitions. > + */ > + > +#ifndef AVCODEC_WEBP_H > +#define AVCODEC_WEBP_H > + > +#define VP8X_FLAG_ANIMATION 0x02 > +#define VP8X_FLAG_XMP_METADATA 0x04 > +#define VP8X_FLAG_EXIF_METADATA 0x08 > +#define VP8X_FLAG_ALPHA 0x10 > +#define VP8X_FLAG_ICC 0x20 > + > +#define ANMF_DISPOSAL_METHOD 0x01 > +#define ANMF_DISPOSAL_METHOD_UNCHANGED 0x00 > +#define ANMF_DISPOSAL_METHOD_BACKGROUND 0x01 > + > +#define ANMF_BLENDING_METHOD 0x02 > +#define ANMF_BLENDING_METHOD_ALPHA 0x00 > +#define ANMF_BLENDING_METHOD_OVERWRITE 0x02 > + > +#define MAX_PALETTE_SIZE 256 > +#define MAX_CACHE_BITS 11 > +#define NUM_CODE_LENGTH_CODES 19 > +#define HUFFMAN_CODES_PER_META_CODE 5 > +#define NUM_LITERAL_CODES 256 > +#define NUM_LENGTH_CODES 24 > +#define NUM_DISTANCE_CODES 40 > +#define NUM_SHORT_DISTANCES 120 > +#define MAX_HUFFMAN_CODE_LENGTH 15 > + > + > +#endif /* AVCODEC_WEBP_H */ 1. Some of these defines (like MAX_CACHE_BITS) are unused now and seem to stay that way in your patchset. 2. If you move defines in a header, you need to ensure that they are properly prefixed so that no conflicts can arise. This is particularly true of defines like VP8X_FLAG_* whose name actually indicates that they belong into a vp8.h. 3. It seems that your patchset only includes this header in webp.c; they are not used outside of it. So there is no need for a header. - Andreas _______________________________________________ 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".