From patchwork Thu Jun 17 02:31:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28438 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp202755iol; Wed, 16 Jun 2021 19:38:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweaahzX43TYWHkghDcnptIixOkZm3VNL8RXtdfHpbukUYRMlt29NY7nCmQYijrs9ID6SaH X-Received: by 2002:a17:906:f889:: with SMTP id lg9mr2699113ejb.82.1623897510550; Wed, 16 Jun 2021 19:38:30 -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 p21si4379544ejn.49.2021.06.16.19.38.30; Wed, 16 Jun 2021 19:38:30 -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="W/cvxcuD"; 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 26C806881C6; Thu, 17 Jun 2021 05:34:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8CFA68812C for ; Thu, 17 Jun 2021 05:33:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rqqd/h1xwt/cPaZ2bU9mzyoSwp7mOEeiIesDYThyahm+zKSXROF21NqnIlQEjrCLuHoXl6QXDhwbuPr6bd4B759VM08AEXNM/0DxaAX158nJLFuBOYojTN+o8CvTTqeF1tj/0+JuAWC9L4s7PQtiW8xA5dBwajNRbGVoQpcakM0i7qVB/z5Ogyx+Nela2l4Ky2jVPzFt59mxDtL8qkHlfFnqsSJD5UGmuJkGoy87zmc/Et4pyij7+3W75rrja/svxgzpt3AL9i53/cExztI4OPB/290pRzIsYtX7YghsfTCHuuPJRq2jqvqJCS0E5o7NuRx9mzeYKdKLN9rzM2+bOA== 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-SenderADCheck; bh=o7J0AhBjCS6ldK/eLRHecjMRrmc4s0ewzf0WkcKcAmw=; b=geceC5l+OM5Dpq125I4OqnCVQZGy7iiAk0OkvgizwPFJliLrnv9GuLmb/inxquFYKBPApaSi04+DB5BnMUfCOG1VrlwQPHp46Xl7xe+bF7vBWqqA876J8KBPkLm2MngAb3C1ozSRlR1pU6LNqXR+kP+aJBHOvVfHolJcDbuI8koEEWCp6/dndtCL2nKxrvZUoqRrHcQDiZ9nchSH144RuM6ZNaJ/JLmraovwHDIVo38Uw9l8+WBhrJb3vNQ1m+l0zJn4hPYYubEQJHWRG3CvDsKSFRhJeILxNFIv8fyfLT+FLomn+QNI/e3EjRsWuOkBmDfOJhYo6yEHegpF/ANNXA== 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=o7J0AhBjCS6ldK/eLRHecjMRrmc4s0ewzf0WkcKcAmw=; b=W/cvxcuD+4fXx1DjAeP8dDmxMTKju8BrnN7by4+x5suH38aoPAxQRlcUwUT193XkStee0sBhCCdqbp9/DXIDFO6XpJuftWw/uO4nJMv6eFk8duCUmpV6RxVpA8pKz/tOk7u7lMqad3FwUOaeyeKbTbsgjHkbvPwJer8R03pps4uV3wbrgLaqZ9V1PE4nhb/+O7ybQ6zwuVMxGJSxVQ97mBgXmp8Xe+3kIGjcb2A4O6nmLhYsvHvncCjmXICcBVFJ84tAqgk4NX3B5WVD8BQFzKoRwuJ4kEeTw4Xy+KIHVgd4tnsy+SUyiGGgDgNqNx3HP3cgClSz0ymOtlh+O5cAug== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::44) by HE1EUR04HT108.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:33:57 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::4b) by HE1EUR04FT053.mail.protection.outlook.com (2a01:111:e400:7e0d::298) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:57 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FE8D200AB38BE2E93A7215E426CD700C8C58DA445EB7897A503AE36DCF6321C7; UpperCasedChecksum:893C0CF98298BE3737B135EC720FF0B235009FDB20709C6ABEB2BEFECED95088; SizeAsReceived:7777; Count:50 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 02:33:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:56 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Mq5nq8luPA1BtYD+3zZHpc3bZluE3Y32] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-34-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:27 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 35977316-9343-41e6-65c2-08d9313849a1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSz7Gd0YLSftKT0G4ETHQtWfgagmXbE5r2EJK0Ii7Tj+jTRdPXyQhTMCbX8C8LadDCNq6WZfQsnZ6swOXWCWejXunwFc5EwA2Hl7r2qXZoCl7xsBf3cfxDJNGOeU3XeJ34iyrVxXujP1Wr8YckD37UwQ9SxAWSKulOJB8mSoYIOsbbogRP3OgNBy/kHRuKNrBfRv5h20K1NxGSxXfxyH7hz+Feu5YxeLmER+e8H2FTXPFuCqu7ADpeqDKYMmBSt37z/JEwQoZiOeBdZPS68yfY+LA/POcaW+hcaElL1HlaoS6UCsQVkFtsHZomK6n39u057DB8nSHJes719PYRyU3HKnJ1OYh2TYFfujoZs0ui0YYkji3aA3Q/l7P9cY8/09UHR2+mo6fRv1lrQGckwYHbkLADr+p8nHUDXeBpH8MElzjMADD6HOJhrcdgSLvgBCaP9mY8JV8yeIDaS92wYZMkOT7GGqwmrq1uUwDG163nx7HlPnoLQB1Bmrtkp6gLmT7CKP75v0WUNcKoOhozO+jrcVRmp8qbbDednmQE+n+Fhjep4v+UsxJBD5Rco1w49eb5l81G02qXkfcWuOcXJcn5nE0N1akXcxaDm/3Ba4W5FOUCtvUpkrswMG+OsyDdWxtLmNJhHH/s6tsbkMUqCb8+OVDQ6jnsz6m5+vWOwUozNZW//1PaLkg1WKvK8ah85QlG2SskT3XIRJRsX2MOsMwKzoHe6OFArLWCxE6aSSNjvZ1XwHkk1JpBRqn+zEG7FYxI= X-MS-TrafficTypeDiagnostic: HE1EUR04HT108: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DsAFO8oa5t5mES6Sr8A6m/Cf3op+vaq7LOH9232CqYIJARKPIdpHIuO3eKXtNsHLwtcKoRRE4bgUL6tV/eLXeIHg1yeCLQEorz3SXGX9IpLvjjEmNArT6AoXVrjSTCvlnDt2vR6blMzM0mLMqc9/YletC0iH6cHikLSoAUpK3RwvNjIEso98wAAvZzMDqNER5E4YDcfKFALsZXhnGE5fnrMIc2TDl0O97axrxa+Ig0PIDW/ee8n4sd7bvzNvLTvwKViNr44qequHe9FNxn9uNAGDT4ctHYpH/g9u3179L1Ths6qr4fuQqDOodJeJTZKIhNiQe8xp81xD+c0tdA+GwK2KO9ojf9jCptloXNyD41kFLywhyC1nhZlXtvd9jiRGAmpQ/I/XItjOI2+iFPW/TQ== X-MS-Exchange-AntiSpam-MessageData: oHAbBAzWlkiEHIlELc3D8eXKZ+ZEQAwTinJC3ttR+RQdX0tfuK4OqLdZSlqZRA/a82DoPstO1o4GY6XnA69LFKsOyLpjBtXZvZzi3zcI6/rX82Mrf1YZtXZC59XdqvLvjdUiy0y10gWmpwA13PB6SA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35977316-9343-41e6-65c2-08d9313849a1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:27.4908 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT053.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT108 Subject: [FFmpeg-devel] [PATCH 35/41] avcodec/libwebpenc: Deduplicate options, AVClass, pix_fmts 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: LzbEHy/GGw37 Signed-off-by: Andreas Rheinhardt --- libavcodec/libwebpenc.c | 17 +++---------- libavcodec/libwebpenc_animencoder.c | 17 +++---------- libavcodec/libwebpenc_common.c | 38 +++++++++++++++++++++++++++++ libavcodec/libwebpenc_common.h | 33 ++++++------------------- 4 files changed, 51 insertions(+), 54 deletions(-) diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c index 97adacb6b2..afaf80047b 100644 --- a/libavcodec/libwebpenc.c +++ b/libavcodec/libwebpenc.c @@ -87,29 +87,18 @@ static int libwebp_encode_close(AVCodecContext *avctx) return 0; } -static const AVClass class = { - .class_name = "libwebp", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVCodec ff_libwebp_encoder = { .name = "libwebp", .long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WEBP, .capabilities = AV_CODEC_CAP_DR1, + .pix_fmts = ff_libwebpenc_pix_fmts, + .priv_class = &ff_libwebpenc_class, .priv_data_size = sizeof(LibWebPContext), + .defaults = ff_libwebp_defaults, .init = libwebp_encode_init, .encode2 = libwebp_encode_frame, .close = libwebp_encode_close, - .pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_RGB32, - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, - AV_PIX_FMT_NONE - }, - .priv_class = &class, - .defaults = libwebp_defaults, .wrapper_name = "libwebp", }; diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index 742aefb467..537f1576bd 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -125,29 +125,18 @@ static int libwebp_anim_encode_close(AVCodecContext *avctx) return 0; } -static const AVClass class = { - .class_name = "libwebp_anim", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVCodec ff_libwebp_anim_encoder = { .name = "libwebp_anim", .long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WEBP, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, + .pix_fmts = ff_libwebpenc_pix_fmts, + .priv_class = &ff_libwebpenc_class, .priv_data_size = sizeof(LibWebPAnimContext), + .defaults = ff_libwebp_defaults, .init = libwebp_anim_encode_init, .encode2 = libwebp_anim_encode_frame, .close = libwebp_anim_encode_close, - .pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_RGB32, - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, - AV_PIX_FMT_NONE - }, - .priv_class = &class, - .defaults = libwebp_defaults, .wrapper_name = "libwebp", }; diff --git a/libavcodec/libwebpenc_common.c b/libavcodec/libwebpenc_common.c index 3c4c3e2294..6a5fa70dcd 100644 --- a/libavcodec/libwebpenc_common.c +++ b/libavcodec/libwebpenc_common.c @@ -24,8 +24,46 @@ * WebP encoder using libwebp: common structs and methods. */ +#include "libavutil/opt.h" #include "libwebpenc_common.h" +const AVCodecDefault ff_libwebp_defaults[] = { + { "compression_level", "4" }, + { "global_quality", "-1" }, + { NULL }, +}; + +#define OFFSET(x) offsetof(LibWebPContextCommon, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "lossless", "Use lossless mode", OFFSET(lossless), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "preset", "Configuration preset", OFFSET(preset), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, WEBP_PRESET_TEXT, VE, "preset" }, + { "none", "do not use a preset", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "preset" }, + { "default", "default preset", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_DEFAULT }, 0, 0, VE, "preset" }, + { "picture", "digital picture, like portrait, inner shot", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_PICTURE }, 0, 0, VE, "preset" }, + { "photo", "outdoor photograph, with natural lighting", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_PHOTO }, 0, 0, VE, "preset" }, + { "drawing", "hand or line drawing, with high-contrast details", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_DRAWING }, 0, 0, VE, "preset" }, + { "icon", "small-sized colorful images", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_ICON }, 0, 0, VE, "preset" }, + { "text", "text-like", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_TEXT }, 0, 0, VE, "preset" }, + { "cr_threshold","Conditional replenishment threshold", OFFSET(cr_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, + { "cr_size" ,"Conditional replenishment block size", OFFSET(cr_size) , AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 256, VE }, + { "quality" ,"Quality", OFFSET(quality), AV_OPT_TYPE_FLOAT, { .dbl = 75 }, 0, 100, VE }, + { NULL }, +}; + +const AVClass ff_libwebpenc_class = { + .class_name = "libwebp encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const enum AVPixelFormat ff_libwebpenc_pix_fmts[] = { + AV_PIX_FMT_RGB32, + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, + AV_PIX_FMT_NONE +}; + int ff_libwebp_error_to_averror(int err) { switch (err) { diff --git a/libavcodec/libwebpenc_common.h b/libavcodec/libwebpenc_common.h index e74e57939e..0c13176b79 100644 --- a/libavcodec/libwebpenc_common.h +++ b/libavcodec/libwebpenc_common.h @@ -29,11 +29,12 @@ #include -#include "libavutil/common.h" +#include "libavutil/attributes.h" #include "libavutil/frame.h" -#include "libavutil/imgutils.h" -#include "libavutil/opt.h" +#include "libavutil/log.h" +#include "libavutil/pixfmt.h" #include "avcodec.h" +#include "codec.h" #include "internal.h" typedef struct LibWebPContextCommon { @@ -57,28 +58,8 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s, const AVFrame *frame, AVFrame **alt_frame_ptr, WebPPicture **pic_ptr); -#define OFFSET(x) offsetof(LibWebPContextCommon, x) -#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM -static const AVOption options[] = { - { "lossless", "Use lossless mode", OFFSET(lossless), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, - { "preset", "Configuration preset", OFFSET(preset), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, WEBP_PRESET_TEXT, VE, "preset" }, - { "none", "do not use a preset", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "preset" }, - { "default", "default preset", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_DEFAULT }, 0, 0, VE, "preset" }, - { "picture", "digital picture, like portrait, inner shot", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_PICTURE }, 0, 0, VE, "preset" }, - { "photo", "outdoor photograph, with natural lighting", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_PHOTO }, 0, 0, VE, "preset" }, - { "drawing", "hand or line drawing, with high-contrast details", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_DRAWING }, 0, 0, VE, "preset" }, - { "icon", "small-sized colorful images", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_ICON }, 0, 0, VE, "preset" }, - { "text", "text-like", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_TEXT }, 0, 0, VE, "preset" }, - { "cr_threshold","Conditional replenishment threshold", OFFSET(cr_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, - { "cr_size" ,"Conditional replenishment block size", OFFSET(cr_size) , AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 256, VE }, - { "quality" ,"Quality", OFFSET(quality), AV_OPT_TYPE_FLOAT, { .dbl = 75 }, 0, 100, VE }, - { NULL }, -}; - -static const AVCodecDefault libwebp_defaults[] = { - { "compression_level", "4" }, - { "global_quality", "-1" }, - { NULL }, -}; +extern const enum AVPixelFormat ff_libwebpenc_pix_fmts[]; +extern const AVClass ff_libwebpenc_class; +extern const AVCodecDefault ff_libwebp_defaults[]; #endif /* AVCODEC_LIBWEBPENC_COMMON_H */