From patchwork Mon Jun 24 17:20:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2155455vqz; Mon, 24 Jun 2024 10:21:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0MJyr5HsDGQr8Tj091m+dRlKmeTuK4Fa2F2WappgXd3KbG41tsNXt88ZRJoO9SttYdvdVWjtaeHCRB0o0065+iaWjCxkyNHSN1Q== X-Google-Smtp-Source: AGHT+IEEy1u7iUmbXk9QB65b4mvHmHZzQMzGHlRbAQcaEQPTORr1g4Vco4eywfGNDvkJ7/E+8GeK X-Received: by 2002:a50:ab5c:0:b0:57d:12c3:eca6 with SMTP id 4fb4d7f45d1cf-57d457943bcmr3897865a12.18.1719249669802; Mon, 24 Jun 2024 10:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719249669; cv=none; d=google.com; s=arc-20160816; b=QuMXUV7djEGLEbGGXIgR7bYyvFN0c+NYiwS3e2hswfS4+3Jw6EUF4udas5EJMhP5ol osqK+9zj9nvExW123qWzgOwlDWR4wE5UBO2e8NC8CZRsqx7OSLoS104dSR0ndp1HeClT zxizs4BtTLA5JszMoC2z0ain/noxfSQhqT/7JC9/IM3VUuALqPsb9RmVa2Y4HluBULQi ux8F0GajiGEJ4XKhcVGC+pILgG6YJXP41u2vJ8X32YtMup2Iexr4+rjW1sS68YH+V7A8 4LJcw299t2gWJGltwmvxkqZmSdqsCSHxfOvRemECB3aEnEVsUqgAmaDpmLnoJWUKDrHM UxQg== 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=ma5TfOA02yQ2nthuJgZKQ94Xc00dKUcffhx+8ekO+oY=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=uGERHbXBmBRX8rsNSWdFDno1rL/UE9ZOYiX2oGgfE2gpFwFK0ySazDKIOiY/TNCCyR blRRrCbajXtT9SdDXAWhHaI8/NxMJ+9gr6ONiNy2x4eJokTBKstAsrGaVPK4HrIRYRV0 LfedHeEWtgIJ5uRRcI+fj+srItDLytNeGNRMWkGNKc+tkO5LAUrkPqwgsHQGJ/Rtqnj2 C1vzIAdkmtiYNZyMirkJEDSwevWbvuH4T5q1YJo2TgR7UewcjgDydwUa27nJcKdsW1I5 OLjC9aMeoqtwNybg1D/T20p1Nm9WG9YtPrsSIvp8Sq198VZ4ht5qGcyEzBI6lUu+Ukw4 TzcQ==; 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=NFCr2NGb; 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 4fb4d7f45d1cf-57d30643348si3857221a12.159.2024.06.24.10.21.09; Mon, 24 Jun 2024 10:21:09 -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=NFCr2NGb; 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 C5F4B68D5B8; Mon, 24 Jun 2024 20:20:58 +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 54D1468D412 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=MrP/OLeSDGLdjQxHBAHE6GFE/+CEqyRTt3sMxb2Y2Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NFCr2NGbCZWoDD91efS64lXHFGaXZ2bIXaMxqs1FDGhqZZC/kMaWbjiBscc/Q1zuW HJGZ07tcBMZHZNF8w0WYiuVSqCyj9Fo9XaJ50/d4pTUKtzZDoqcLleAyzm+IvSl9n1 mRob7Osq560KA/D5k9VgyBYu8WAlqPwS3h0kiwEY= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 1A9864079C; Mon, 24 Jun 2024 19:20:48 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 19:20:37 +0200 Message-ID: <20240624172044.101722-2-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 2/9] avcodec/dovi_rpuenc: also copy ext blocks to dovi ctx 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: YvUCrjx+MRcj From: Niklas Haas As the comment implies, DOVIContext.ext_blocks should also reflect the current state after ff_dovi_rpu_generate(). Fluff for now, but will be needed once we start implementing metadata compression for extension blocks as well. --- libavcodec/dovi_rpuenc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index a14c9cc181..f0cfecc91b 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -506,6 +506,12 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } } + if (metadata->num_ext_blocks && !s->ext_blocks) { + s->ext_blocks = ff_refstruct_allocz(sizeof(AVDOVIDmData) * AV_DOVI_MAX_EXT_BLOCKS); + if (!s->ext_blocks) + return AVERROR(ENOMEM); + } + vdr_dm_metadata_present = memcmp(color, &ff_dovi_color_default, sizeof(*color)); use_prev_vdr_rpu = !memcmp(s->vdr[vdr_rpu_id], mapping, sizeof(*mapping)); if (num_ext_blocks_v1 || num_ext_blocks_v2) @@ -636,6 +642,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } if (vdr_dm_metadata_present) { + size_t ext_sz; const int denom = profile == 4 ? (1 << 30) : (1 << 28); set_ue_golomb(pb, color->dm_metadata_id); /* affected_dm_id */ set_ue_golomb(pb, color->dm_metadata_id); /* current_dm_id */ @@ -673,6 +680,11 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, for (int i = 0; i < metadata->num_ext_blocks; i++) generate_ext_v2(pb, av_dovi_get_ext(metadata, i)); } + + ext_sz = FFMIN(sizeof(AVDOVIDmData), metadata->ext_block_size); + for (int i = 0; i < metadata->num_ext_blocks; i++) + memcpy(&s->ext_blocks[i], av_dovi_get_ext(metadata, i), ext_sz); + s->num_ext_blocks = metadata->num_ext_blocks; } else { s->color = &ff_dovi_color_default; s->num_ext_blocks = 0;