From patchwork Mon Jun 24 17:20:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2155654vqz; Mon, 24 Jun 2024 10:21:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIml7x/B56eA7Z4y/7Ef8ElfWj/1rRMDxi0Ri3icQUxG0LVpznWK6sLqJrc+7E+5D6LZ2xE2S7oPcj/QT+IWwqDUuWBrx67iOR/A== X-Google-Smtp-Source: AGHT+IFfTb/cC8BlrrkfoWhnPSXSz8iH6yiZtSW31NDVngpg8G/a/7PLotfYoXuTJY1//dqK64Qr X-Received: by 2002:a17:906:c78c:b0:a6f:da1:d077 with SMTP id a640c23a62f3a-a7242c39b60mr411865966b.25.1719249689864; Mon, 24 Jun 2024 10:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719249689; cv=none; d=google.com; s=arc-20160816; b=XSEcwtK3Ir/fX20fnMuk6lCDgGjni8SbH99G2IIQ2B51RH4lazx3bETzKbqyzFYM/E uRcnPrMamhNriE+qgsu09n91ccsBR63LQBP34YIxjjMt01L8RuPsEOq1eTwRPzITXVq8 IBz563ytpVeqN4B26v/hoin7iZhETpmbpwoPz2KArxGKnbwdrakl3f2j7HaqqUcBnd/8 dL5YzY77PU2Dqe6KZ0dp9afL/vkpiATkMcs7IB8fqCQQ5zDciy7qeZNwTZcCYv1GO6ie JMpaLFCoK0giw73TdvV53mVZGf69BmPwthgGQv3P5GGGqCBolLvrjLmhVRH1IlnIpqeO 8iYQ== 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=pUBgJCxYxdSk82Fdn1s4WRhav8x0ZTCLtQ64Rg68KnY=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=T3gfcke4KKZHGvHSfhdTsioNxCZIw3BDJflVpXaudXcMn1ACxz2HAtlNr/bJBwqvc8 PlXxW6/sskGYHsOFUmhTR+2EAA7QUvKKnDSAg8bwirSrDRT6cZ6nfw4quEB4OW38J5/j i/B+FTqYiDblP+avZngUdU693MpCSubYFqophTQhxKeGgeVCRbTEOM0cdvKbj6RTxwO/ EZwyx4LDefZMWwIY69/IXxIglGnfm5G+QdJ+YOeURAR5Nh6HW4sOpcQi45NyyDRRtq7G 5m016kEJUcwH7CZIEJsrc4ZppR/SZGenYcX54VByxllSfrVIy7FjruUVFRG02B4upzkh vTqw==; 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=M3W6pu2W; 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 a640c23a62f3a-a725fd1ff0bsi53669466b.718.2024.06.24.10.21.29; Mon, 24 Jun 2024 10:21:29 -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=M3W6pu2W; 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 502F268D621; Mon, 24 Jun 2024 20:21:01 +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 B418F68D4AF for ; Mon, 24 Jun 2024 20:20:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1719249648; bh=9eKmsvqOu88j3SccR45+kOgyYohtNs8pu4Kpmk0b12c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M3W6pu2W4fqfLcb0L54CT81p2w8gQtrgRpOq1jayzy0TP19vI0EYRWm06e4YL46hf TUlwUkmRTVupsAou43QWTFjaAHVkqlYuX4bwoSXAToJRtwLzazDsg8ckh25X6c8znL JV1cQnG1Bffhd4fqYrOrIUV02xtuvKp2peFgnrjM= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 867E343E93; Mon, 24 Jun 2024 19:20:48 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 19:20:39 +0200 Message-ID: <20240624172044.101722-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240624172044.101722-1-ffmpeg@haasn.xyz> References: <20240624172044.101722-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/dovi_rpuenc: allow changing vdr_rpu_id 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: Fh7YLzvwlaQY From: Niklas Haas The version as written also compared the vdr_rpu_id field, which would defeat the purpose of trying to look for a matching slot in the first place. --- libavcodec/dovi_rpuenc.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 30b6b09f1d..f10e175350 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/avassert.h" #include "libavutil/crc.h" #include "libavutil/mem.h" @@ -201,6 +203,15 @@ skip: return 0; } +/* compares data mappings, excluding vdr_rpu_id */ +static int cmp_data_mapping(const AVDOVIDataMapping *m1, + const AVDOVIDataMapping *m2) +{ + static_assert(offsetof(AVDOVIDataMapping, vdr_rpu_id) == 0, "vdr_rpu_id is first field"); + const void *p1 = &m1->vdr_rpu_id + 1, *p2 = &m2->vdr_rpu_id + 1; + return memcmp(p1, p2, sizeof(AVDOVIDataMapping) - sizeof(m1->vdr_rpu_id)); +} + static inline void put_ue_coef(PutBitContext *pb, const AVDOVIRpuDataHeader *hdr, uint64_t coef) { @@ -465,7 +476,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, vdr_rpu_id = mapping->vdr_rpu_id; for (int i = 0; i <= DOVI_MAX_DM_ID; i++) { - if (s->vdr[i] && !memcmp(s->vdr[i], mapping, sizeof(*mapping))) { + if (s->vdr[i] && !cmp_data_mapping(s->vdr[i], mapping)) { vdr_rpu_id = i; break; } else if (s->vdr[vdr_rpu_id] && !s->vdr[i]) { @@ -639,6 +650,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } memcpy(s->vdr[vdr_rpu_id], mapping, sizeof(*mapping)); + s->vdr[vdr_rpu_id]->vdr_rpu_id = vdr_rpu_id; } if (vdr_dm_metadata_present) {