From patchwork Mon Mar 4 13:06:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2788484pzb; Mon, 4 Mar 2024 05:07:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUpJswaOm4bQoWMw2C6m/Vzp7cOk1Eu7YG8VeMJRegJFM07hlJrQO5aWUUT1kHT0dDRmEhZEaWUO+Vi8bXRlF1GRoinAqPa3IcPVQ== X-Google-Smtp-Source: AGHT+IE6/7bCgdreb74nrB3Yxspr03XQCsP99MKOvgbJd3MdbpoK+ZcxDersWOh/CJkk0oSSi+fu X-Received: by 2002:a17:906:7118:b0:a45:5a30:a3f2 with SMTP id x24-20020a170906711800b00a455a30a3f2mr1405685ejj.52.1709557649591; Mon, 04 Mar 2024 05:07:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557649; cv=none; d=google.com; s=arc-20160816; b=AbxtdjtafPug73+/zK7gk1QcbATXmn4h2PbJW+9TOLmEUS+B9aYYAFR5QB190iuSxM U3Px9ql887+TOscZuAwAE5YCHOqVtSz6CA74I1bKFEtYPCe9CkzSbw5dzkmU0SGcAwWc 0ZwQCJFD+oOtjbpDjnaKkuIrue9aXGqvYD/90IF1u/FSbvfEcedrLmpUhYf8diM1nP0Q qQVy456a1wK7Xi2CnePU/hfTFNDe6MMPh/x/aR7xWhzl+DrSdLFtHSVjpyWqTXnjGnpv V8k2PIFG0YRaiFm8n/sdxY0OORB273JQbYh01/nkBTUr51q8ISL3TqveGredYtTOM1Al ksRA== 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=CHQ36GDiEIZjsJh08B4f5cGxOVENurM21jlDTKD/RfE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=PHGCYr5lN08MaHRZRiouZmVHgRDNgPc+shtp098qpP+vtNqj7nzXNvQWAKR38L+5Bg tU32jU1QyCYUA0LdsvhJnRSzTnYSlMb7PCBT7WorcoLeD9uEbCIrg5X/CDP81oEtC74N rDRDQejNMF/a79Mer9cMifzfv+kmt97/Aowx8AaC8ZN6Ki6qSy8WAWcoAvj7hBYAHYqJ cQ/JYEFEBPEL6UJeKfMg42qEiXSCaofdMglMJHRPjzlfcjvLAHBYfiMmd5IuJo7LK7FD ZtIYEilKxXhQE5Xplm3clzkze4qT07+bdI4vRwmIkS/tCC/VYUJnuANkX1JZV82tL5lh LGLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=gsnlHVUI; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wv6-20020a170907080600b00a3e616874f3si4153881ejb.993.2024.03.04.05.07.28; Mon, 04 Mar 2024 05:07:29 -0800 (PST) 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=@khirnov.net header.s=mail header.b=gsnlHVUI; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2F5568D35D; Mon, 4 Mar 2024 15:07:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE20A68D36E for ; Mon, 4 Mar 2024 15:07:08 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=gsnlHVUI; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 2C3424D42 for ; Mon, 4 Mar 2024 14:07:08 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 9u-KkEtHclRa for ; Mon, 4 Mar 2024 14:07:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=aZS/tmQsLzXyN39C0Pgl4bZjlhYHyB+XNrUDoV3vCpg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gsnlHVUIYiD4POVGxRzN88rFtdoXZfvjZHW0p7PreQtzf9HzhYcoZ6t5d/z3nwGT+ m16Xyfv4w54PdTZ7jJ75EhXdfrHwNI6i4eiFlsOrbyqcCJ2lQhGIMSBUTx5Lx8mZCe o+G4OG5yTPxV6TPL2mzs3mnGCjo6j8FvSQAB2G6wZPhTdpG+UI2mJPNZsPy621KNWS 9KbswoFfLsVIV7PGv3bRHwxLlVAs4/y0iosi+V9wty2zyJj6dpztE1L90jriLtGm13 pxaeEobz7oGHYTkdtWINDYMnCYXe/hW8MnBWXF19EWMwOaxQpVzQ+j5+U3OEJHX2sl rQFMByhXkMNdw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 4B42E4D46 for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id EFE283A076E for ; Mon, 4 Mar 2024 14:06:59 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:18 +0100 Message-ID: <20240304130657.30631-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/29] libavutil/opt: rework figuring out option sizes 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: JDLEjKc4hy7/ Replace the opt_size() function, currently only called from av_opt_copy(), with * a constant array of element sizes * a function that signals whether an option type is POD (i.e. memcpyable) or not Will be useful in following commits. --- libavutil/opt.c | 100 +++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 44 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index b372c76120..051a121331 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -56,6 +56,56 @@ const AVOption *av_opt_next(const void *obj, const AVOption *last) return NULL; } +static const size_t opt_elem_size[] = { + [AV_OPT_TYPE_FLAGS] = sizeof(unsigned), + [AV_OPT_TYPE_INT] = sizeof(int), + [AV_OPT_TYPE_INT64] = sizeof(int64_t), + [AV_OPT_TYPE_UINT64] = sizeof(uint64_t), + [AV_OPT_TYPE_DOUBLE] = sizeof(double), + [AV_OPT_TYPE_FLOAT] = sizeof(float), + [AV_OPT_TYPE_STRING] = sizeof(char *), + [AV_OPT_TYPE_RATIONAL] = sizeof(AVRational), + [AV_OPT_TYPE_BINARY] = sizeof(uint8_t *), + [AV_OPT_TYPE_DICT] = sizeof(AVDictionary *), + [AV_OPT_TYPE_IMAGE_SIZE] = sizeof(int[2]), + [AV_OPT_TYPE_VIDEO_RATE] = sizeof(AVRational), + [AV_OPT_TYPE_PIXEL_FMT] = sizeof(int), + [AV_OPT_TYPE_SAMPLE_FMT] = sizeof(int), + [AV_OPT_TYPE_DURATION] = sizeof(int64_t), + [AV_OPT_TYPE_COLOR] = sizeof(uint8_t[4]), +#if FF_API_OLD_CHANNEL_LAYOUT + [AV_OPT_TYPE_CHANNEL_LAYOUT]= sizeof(uint64_t), +#endif + [AV_OPT_TYPE_CHLAYOUT] = sizeof(AVChannelLayout), + [AV_OPT_TYPE_BOOL] = sizeof(int), +}; + +// option is plain old data +static int opt_is_pod(enum AVOptionType type) +{ + switch (type) { + case AV_OPT_TYPE_FLAGS: + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_INT64: + case AV_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_FLOAT: + case AV_OPT_TYPE_RATIONAL: + case AV_OPT_TYPE_UINT64: + case AV_OPT_TYPE_IMAGE_SIZE: + case AV_OPT_TYPE_PIXEL_FMT: + case AV_OPT_TYPE_SAMPLE_FMT: + case AV_OPT_TYPE_VIDEO_RATE: + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_COLOR: +#if FF_API_OLD_CHANNEL_LAYOUT + case AV_OPT_TYPE_CHANNEL_LAYOUT: +#endif + case AV_OPT_TYPE_BOOL: + return 1; + } + return 0; +} + static int read_number(const AVOption *o, const void *dst, double *num, int *den, int64_t *intnum) { switch (o->type) { @@ -1850,45 +1900,6 @@ void *av_opt_ptr(const AVClass *class, void *obj, const char *name) return (uint8_t*)obj + opt->offset; } -static int opt_size(enum AVOptionType type) -{ - switch(type) { - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_FLAGS: - return sizeof(int); - case AV_OPT_TYPE_DURATION: -#if FF_API_OLD_CHANNEL_LAYOUT -FF_DISABLE_DEPRECATION_WARNINGS - case AV_OPT_TYPE_CHANNEL_LAYOUT: -FF_ENABLE_DEPRECATION_WARNINGS -#endif - case AV_OPT_TYPE_INT64: - case AV_OPT_TYPE_UINT64: - return sizeof(int64_t); - case AV_OPT_TYPE_DOUBLE: - return sizeof(double); - case AV_OPT_TYPE_FLOAT: - return sizeof(float); - case AV_OPT_TYPE_STRING: - return sizeof(uint8_t*); - case AV_OPT_TYPE_VIDEO_RATE: - case AV_OPT_TYPE_RATIONAL: - return sizeof(AVRational); - case AV_OPT_TYPE_BINARY: - return sizeof(uint8_t*) + sizeof(int); - case AV_OPT_TYPE_IMAGE_SIZE: - return sizeof(int[2]); - case AV_OPT_TYPE_PIXEL_FMT: - return sizeof(enum AVPixelFormat); - case AV_OPT_TYPE_SAMPLE_FMT: - return sizeof(enum AVSampleFormat); - case AV_OPT_TYPE_COLOR: - return 4; - } - return AVERROR(EINVAL); -} - int av_opt_copy(void *dst, const void *src) { const AVOption *o = NULL; @@ -1939,12 +1950,13 @@ int av_opt_copy(void *dst, const void *src) } else if (o->type == AV_OPT_TYPE_CHLAYOUT) { if (field_dst != field_src) ret = av_channel_layout_copy(field_dst, field_src); + } else if (opt_is_pod(o->type)) { + size_t size = opt_elem_size[o->type]; + memcpy(field_dst, field_src, size); } else { - int size = opt_size(o->type); - if (size < 0) - ret = size; - else - memcpy(field_dst, field_src, size); + av_log(dst, AV_LOG_ERROR, "Unhandled option type: %d\n", + o->type); + ret = AVERROR(EINVAL); } } return ret;