From patchwork Thu Jul 6 11:27:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 42461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp6445560pzh; Thu, 6 Jul 2023 04:27:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlG185q+3IuGiy/gBcgnZguTwEeASdyIoM4nyQgDWzIyv7DFs6pXxodfzNXP0Me/4RaYNeO4 X-Received: by 2002:a17:906:116:b0:969:813c:9868 with SMTP id 22-20020a170906011600b00969813c9868mr1105324eje.18.1688642875894; Thu, 06 Jul 2023 04:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688642875; cv=none; d=google.com; s=arc-20160816; b=K3dlIra1y31UKyTYjIz/eUIr912aAwGXad2tubzAMLJNBiEa455XOnuf4sm05QjUS9 KH88ydBr+EAyYRrH17HpQDVUHqKzactNAHL3ZT65muaQMEfWBrHLd0nlt/2JPMOJ0b5N 38kJzihbqN43obW6uCk7u3k+qfb872pgUTAU7WVeysajcJsNM3HcSMLubvfkZuP+t1kI 2hvJx0PMc+3vywCh+6uxbLC/tINoDpT7QpgvPt67sBDRlrORcAWwfsmTTkPhV2xuyqeA 1WvFElUhf5lBb9AdaQ/fQN1Ax2J2MSFFfEyusxDAoKd0Mc6gekM1EQQ70wCr4ZGZoFFG pQcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gPsmioLk/FRba/fCMrQZIbORqVP6Gewx0vqZSghJlgg=; fh=HD4ndZ9hLL4mcfDFnlTmTEEgN7ZZ8c1Zu9bV17rPaE8=; b=cAWZdtVRmDyfKFssrlHRxUm3h4NnrGEj2nF3x9GDgUG4Vw5cd22VDSnVL+hcebVoBe Zz7HapEl1TJe6PBRNAviChfj1nphjcePsz6HPthTy25Za2hN4WJphhiW1fZkz/2wU/VY ByFRFoHNoeVcpiocfEY2l2DbsVKgYt74WOIWB9v3hjductHfr9jAahOZSGKi9pTGbhFU 2mBImelxM4UI8DhER6H6Stkme+kymb73X9Lw1uPH06Pgnlx9GmR1T8Flwckf3bKsoDBS Q+V3bNgygDEziDO7jZcY2+qp+o0chkmG1Or26TFFjs/oU2K+PjaEEuBENfX6MkEYAuKf syhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=wAUZUkWK; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h20-20020a170906855400b00988da29a08fsi627129ejy.841.2023.07.06.04.27.55; Thu, 06 Jul 2023 04:27:55 -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=@mail.de header.s=mailde202009 header.b=wAUZUkWK; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4A0A68C6F1; Thu, 6 Jul 2023 14:27:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [62.201.172.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2804D68C697 for ; Thu, 6 Jul 2023 14:27:33 +0300 (EEST) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout01.mail.de (Postfix) with ESMTP id C226BA2D7A for ; Thu, 6 Jul 2023 13:27:32 +0200 (CEST) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix03.mail.de (Postfix) with ESMTP id AB081801D0 for ; Thu, 6 Jul 2023 13:27:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1688642852; bh=FZm94jNMGMbNWGwYgQ/rQKeOJwbPJuTCr+PeQHFjtV4=; h=From:To:Subject:Date:Message-Id:From:To:CC:Subject:Reply-To; b=wAUZUkWK4wGEJI9TBQWlgANVubucX1U9kkmESyhI4vrxku0ksQqHfqRT3TrjrhhLi 612gYe1ma7q3bPU9sdT41TiAIDei/L4GHR/l0l2iSwyx4if9LeTe46pQHEf2/XrtUE 4CZ4Jv+0D2E5SV4BmuQdHiRoK24vt0EESSD1Dy0JNeXiAWcBtdzLClEIjn0fvJt/JY tMBGZCCvxNmj/s22ClmIekkRTN+7i5/n7KsAUzwcAYZDynSkdJOLHiHYCLE+SujVxl ZBR3G4/ISHWiOJQxSVHuq5OwCW1I0JZprVqtYXOrFqryLMSO0evQr7FebTsa9rf7Bw H/1qRTF06Wcqw== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id 75956C002F for ; Thu, 6 Jul 2023 13:27:32 +0200 (CEST) From: Thilo Borgmann To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2023 13:27:27 +0200 Message-Id: <20230706112731.35895-2-thilo.borgmann@mail.de> In-Reply-To: <20230706112731.35895-1-thilo.borgmann@mail.de> References: <20230706112731.35895-1-thilo.borgmann@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 3382 X-purgate-ID: 154282::1688642852-1FFFBC09-4D22C566/0/0 Subject: [FFmpeg-devel] [PATCH v2 1/5] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mYr+R+n8O1iH --- 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 */