From patchwork Thu Jun 8 14:20:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 42007 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp434273pzb; Thu, 8 Jun 2023 07:20:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BYiP4EfxPzA8l6Vo98qHuEyMG4XuE+WtTxAbq4ViFnVh80m4bFoB4Fx1Dcr8Mm9VlnZmj X-Received: by 2002:a17:906:6a15:b0:970:c9f:2db6 with SMTP id qw21-20020a1709066a1500b009700c9f2db6mr9805012ejc.63.1686234055283; Thu, 08 Jun 2023 07:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686234055; cv=none; d=google.com; s=arc-20160816; b=gsYUsIpDCRfSl67Kp69XlTTRsX5tSdwNnEO+XCMgOirraqBdfKwPxoeM8XPHfCAJeQ mGONR8aajoMJYcnVHVS/lMq+1xIvJn/3EzUCAGOFpKAGmCuN4r+et0v6N6XfyA+5zcyg VfZh4qqnoFDANLRktTRV0/p1inTM/YVIRGg9cXALfFtAWTVJWeuu4wG/pFRPOySjbet8 KpCWVIj9sqBV1W6Zd9TMOu6Y+XP5/Kgyv2ClmIPOJ4167RNPKWhP0V+Y5NvUirp+I2Z7 q7AW2PqT8SR9+voQ2/D0M1oPcvAdwEMph3lJxbOa6G08M1mvHCh93M47glnK2Q7EJF6V hBZw== 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=; b=ygtA/s3eXLQeEIEtKgPK3Nzr8xisPDoF+aGxbnLkHzVqQ20GaO0ztOxNFxdxMjNOy4 ZFbcee2Je+L39CS91rDAXy6Bq8y4y3j6kpEFXhCNnAb4cpkblyGlQL+ZbkKv6ytkhuO3 GRQW8hLds/hl+nxkQQY+Y4LYxuIsQ/So+tF1I6LMnP0H5i310e5vHBvJvN5knzguGLET OuqXYhtsXpeoZVq7hM4Ei8CU0Q0KgHnAr4I8D5jppvgq+xLeHBEDdv2itTtMuRqrGpsn Hn16AvoePpFhqnu4+frHiX/c6jkI79PEmKZHRu3bvj5ll7lccn+Z7n05XozYiEAMi85V 6nqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b="6b/k+DGg"; 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=NONE 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 d24-20020a50fe98000000b005163bfbd479si730674edt.66.2023.06.08.07.20.54; Thu, 08 Jun 2023 07:20: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="6b/k+DGg"; 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=NONE 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 99C7868C2D1; Thu, 8 Jun 2023 17:20:38 +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 7B4EB68C2C7 for ; Thu, 8 Jun 2023 17:20:31 +0300 (EEST) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout01.mail.de (Postfix) with ESMTP id 25F5DA065B for ; Thu, 8 Jun 2023 16:20:31 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix03.mail.de (Postfix) with ESMTP id 0CE7580167 for ; Thu, 8 Jun 2023 16:20:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1686234031; bh=FZm94jNMGMbNWGwYgQ/rQKeOJwbPJuTCr+PeQHFjtV4=; h=From:To:Subject:Date:Message-Id:From:To:CC:Subject:Reply-To; b=6b/k+DGgplhlGQ2rK/YzDkYFrlKi7lOtcJk7eWdDAEbbqdRuKigV4hHw2PTYMkjlZ ZD5jFjl381xBvAfwhOJTmTZvyrIG724WCklI6xXBUcwjtQajiy8YPkeeAPa4a/r2lv t5XSVURcFK+/Oc490bLsOy8InSsajEsBemOFtBg3UMt5ARGOHHHPalJy26knFU1OPb Z5VPpg1bvzSwdpoaPcHfj2cdKBrLnm69OsRF5428AjeuDSie/W5XxRZ0bvtnSd+3K1 ngNsymCzWM9HuWhPZ0vDY6jdb0MPHlvnmYoazj8EUVx4vky0MEBOujnmUEnqfrHRrm M43OsacsOExJg== 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 smtp01.mail.de (Postfix) with ESMTPSA id C6D87100594 for ; Thu, 8 Jun 2023 16:20:30 +0200 (CEST) From: Thilo Borgmann To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Jun 2023 16:20:26 +0200 Message-Id: <20230608142029.16564-2-thilo.borgmann@mail.de> In-Reply-To: <20230608142029.16564-1-thilo.borgmann@mail.de> References: <20230608142029.16564-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::1686234030-077FA7B6-FAA70D71/0/0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o8DHfdBINZHf --- 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 */