From patchwork Sun Jun 9 15:05:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 49744 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2052054vqo; Sun, 9 Jun 2024 08:06:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXuzsgPmGBoAQ3wsSgHgVP0gl3fiKtSbYCFwLnj3otbfne/KSVH/cF8ZXOWQsbHhgSkqvOfRuJwG4reWnubJqjdApw2wIcZi+Ctw== X-Google-Smtp-Source: AGHT+IGrM12amwVagKNXe0LNs7B1vGSQQ9488QuJkSH4hkm6tcYmehTk2153MJQnKb7C9gqDB5xo X-Received: by 2002:a05:6512:2ed:b0:52c:82d9:66b8 with SMTP id 2adb3069b0e04-52c82d96730mr1660862e87.36.1717945583212; Sun, 09 Jun 2024 08:06:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717945583; cv=none; d=google.com; s=arc-20160816; b=gTtTBtjaAbqziEq9nTRrsQFLUdW7uoqn8UWYGzdRKsSllb8gcBlAOfbqitSyJxaFG2 rGrpEFl7v3V5v/5gjJZ4LpT9tsLmwqXnaZdvQ3+A70B9jThm8CLoJYQTqtvMdP5+83Zh pyd0CeDXhQzR4nHm1u9shpP/aiFtHsCeDj2udxydmqZl4sh28NtbqdTB6zNy05UOyh++ Q/ddrosxZO6uRtEPjfsKZSXWxqYuoE4Ghz1LqTwbwUAa0ueif6DPzVq9+jrRZcC+9/TZ BE5WEEqPoZXWLGbHcHeKbgLkF7sWMSN4JZb1POMGLRQ1ZC/Ct5RdikEWCITZQ+UfOMGQ owUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=1i5fJ6HZ/ITlXcVxfbBrmsKs/tK4hpfUA4kVZhP7+BQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=BRJ31Rmm7N2KpyuP01N6E48c4hZRXZZ68HO9l1JOYJJcvU0So0rbdh6A+Ki3RsoDTu Lj4GypSvIFOA4wiKkXUPWp/uA1AeiUn/fvEKF475rIsGcqBiqW8sG9d+vZcRAGSvCair 9/73uFS1F1zKfSUW0evj0a5QxCFNu+HzOorba6W2U+unaSUDhbWrAB7SO+1LtM8MGUa4 m3Oicgc7gTjoCShr4j+owr4jhdz4jxOBEnu6HoqMeb+1qChx/rFdE0MIuB4rNNUf1Bqs rbWJuOY4hm0a/8d0O3MpHhFzXG/SbuNRRAIby7gD/f92WBrY+UZul8D5aGsbPH1FBN1e PhTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=nGWXhn1k; 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 2adb3069b0e04-52c814a4c89si772644e87.133.2024.06.09.08.06.22; Sun, 09 Jun 2024 08:06:23 -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=@haasn.xyz header.s=mail header.b=nGWXhn1k; 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 3115568D331; Sun, 9 Jun 2024 18:06:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 837FF68D243 for ; Sun, 9 Jun 2024 18:05:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1717945557; bh=EHlVwvcjuPmstJYl875kUavBYgwg2YCp/piSW92bfNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nGWXhn1kOFVwAyWbtgbhdPqfQ2RN4UZ7kwG7Gm1xHI+npLU8gdvdr4dyzrWXc8mnT 0A56pB7jDU6zNePNtcIxcdY13z4KSBSHymWjUdVLJA6yQ/5S5wpVGJTMjVyClTjEOp i+Glkq3IIFXxeovaKYAM0ZvGJC6PDxj2Pj1AOG/I= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id DF89242548; Sun, 9 Jun 2024 17:05:57 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 17:05:50 +0200 Message-ID: <20240609150553.72865-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240609150553.72865-1-ffmpeg@haasn.xyz> References: <20240609150553.72865-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] avcodec/dovi_rpu: simplify vdr type 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cC6+6nKWWDqG From: Niklas Haas Storing the color metadata alongside the data mapping is no longer needed, so we can simplify this array's type. --- libavcodec/dovi_rpu.h | 7 +------ libavcodec/dovi_rpudec.c | 6 +++--- libavcodec/dovi_rpuenc.c | 10 +++++----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index da9bd67cde..058d50c64f 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -75,7 +75,7 @@ typedef struct DOVIContext { * Private fields internal to dovi_rpu.c */ AVDOVIColorMetadata *dm; ///< RefStruct - struct DOVIVdr *vdr[DOVI_MAX_DM_ID+1]; ///< RefStruct references + AVDOVIDataMapping *vdr[DOVI_MAX_DM_ID+1]; ///< RefStruct references uint8_t *rpu_buf; ///< temporary buffer unsigned rpu_buf_sz; @@ -127,11 +127,6 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx); * The following section is for internal use only. * ***************************************************/ -typedef struct DOVIVdr { - AVDOVIDataMapping mapping; - AVDOVIColorMetadata color; -} DOVIVdr; - enum { RPU_COEFF_FIXED = 0, RPU_COEFF_FLOAT = 1, diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index 753e402dc6..51f824d126 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -453,18 +453,18 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, prev_vdr_rpu_id); goto fail; } - s->mapping = &s->vdr[prev_vdr_rpu_id]->mapping; + s->mapping = s->vdr[prev_vdr_rpu_id]; } else { AVDOVIDataMapping *mapping; int vdr_rpu_id = get_ue_golomb_31(gb); VALIDATE(vdr_rpu_id, 0, DOVI_MAX_DM_ID); if (!s->vdr[vdr_rpu_id]) { - s->vdr[vdr_rpu_id] = ff_refstruct_allocz(sizeof(DOVIVdr)); + s->vdr[vdr_rpu_id] = ff_refstruct_allocz(sizeof(AVDOVIDataMapping)); if (!s->vdr[vdr_rpu_id]) return AVERROR(ENOMEM); } - s->mapping = mapping = &s->vdr[vdr_rpu_id]->mapping; + s->mapping = mapping = s->vdr[vdr_rpu_id]; mapping->vdr_rpu_id = vdr_rpu_id; mapping->mapping_color_space = get_ue_golomb_31(gb); mapping->mapping_chroma_format_idc = get_ue_golomb_31(gb); diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 59e8ed6e3e..8fceefe2c1 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -465,7 +465,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, vdr_rpu_id = -1; for (int i = 0; i <= DOVI_MAX_DM_ID; i++) { - if (s->vdr[i] && !memcmp(&s->vdr[i]->mapping, mapping, sizeof(*mapping))) { + if (s->vdr[i] && !memcmp(s->vdr[i], mapping, sizeof(*mapping))) { vdr_rpu_id = i; break; } else if (vdr_rpu_id < 0 && (!s->vdr[i] || i == DOVI_MAX_DM_ID)) { @@ -474,7 +474,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } if (!s->vdr[vdr_rpu_id]) { - s->vdr[vdr_rpu_id] = ff_refstruct_allocz(sizeof(DOVIVdr)); + s->vdr[vdr_rpu_id] = ff_refstruct_allocz(sizeof(AVDOVIDataMapping)); if (!s->vdr[vdr_rpu_id]) return AVERROR(ENOMEM); } @@ -507,7 +507,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } vdr_dm_metadata_present = memcmp(color, &ff_dovi_color_default, sizeof(*color)); - use_prev_vdr_rpu = !memcmp(&s->vdr[vdr_rpu_id]->mapping, mapping, sizeof(*mapping)); + use_prev_vdr_rpu = !memcmp(s->vdr[vdr_rpu_id], mapping, sizeof(*mapping)); if (vdr_dm_metadata_present && !s->dm) { s->dm = ff_refstruct_allocz(sizeof(AVDOVIColorMetadata)); @@ -563,7 +563,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, put_bits(pb, 1, vdr_dm_metadata_present); put_bits(pb, 1, use_prev_vdr_rpu); set_ue_golomb(pb, vdr_rpu_id); - s->mapping = &s->vdr[vdr_rpu_id]->mapping; + s->mapping = s->vdr[vdr_rpu_id]; profile = s->cfg.dv_profile ? s->cfg.dv_profile : ff_dovi_guess_profile_hevc(hdr); @@ -629,7 +629,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } } - memcpy(&s->vdr[vdr_rpu_id]->mapping, mapping, sizeof(*mapping)); + memcpy(s->vdr[vdr_rpu_id], mapping, sizeof(*mapping)); } if (vdr_dm_metadata_present) {