From patchwork Sun Jul 28 10:25:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50785 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp582258vqi; Sun, 28 Jul 2024 03:26:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/c70Bhkd3fJkGoxbtEi+q5Mfm1qL8dEryPsismcq2QALFeDLnGgv/EGpqtWIAZIaEv7doUG7PgMuAnpqs/Re0dT4bWr7xMCJxDA== X-Google-Smtp-Source: AGHT+IGeCuzmdNB8zUt+7A5+lpZ+fi0KiPRqu0Vyoro476u7QWgPV+NInjPDH0B9OWQJRRx9dwYz X-Received: by 2002:a2e:80d3:0:b0:2ef:226e:e150 with SMTP id 38308e7fff4ca-2f12ee57791mr37075411fa.32.1722162384469; Sun, 28 Jul 2024 03:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722162384; cv=none; d=google.com; s=arc-20160816; b=lMc97Wwe2W5C+iPDODyr/JMnN8qXr5FE+PFc5A5Puf/XX5Seu2HKMzR5TQAYcV+KcV jjHEf4eJO1M2o3gOBjTfZ8/96mrHpgMWtijpoGh631pTpaCUQr1EAN47xspcRHA4rGfM 72bL40iv3OcJCigqOT6CT0wqHcF7df+SyD292eV6QinRh7xLo/SZUZotbZbrrgNVD9s1 g4+qxVTXNDIUoLIpcVU57SChQoYN/8utbCuNhOIzrVzdZD1JepMH8ApvbHTPc2jnXqTo Woz/TC7K5m2mMrUAudfeO+o9bDysu+hFf+5uzbQQffykrWO/twspFhelpjhpaut9XwcZ gOYw== 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=8dhXvoRRM8TXTr2OEpE/eFevIrxYtPreufRksYNJxRE=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=y+d+zjV8fTQtJq4Ot5zD0+/cJmzgkqoNr5R0/Tekd/N8FEXG0GqmA5y2TW/5q6F4DQ JXPX3zfKw+Rj4K0XUzzznYD6LJ4Ruq74Ilyiu7g0qbFidXBbANu6rfNbgnFb36sf33Yo rZODQIomuDz8lQEBRki4e6iwg8+ZxPKfTlxOkXFy9cJ3smUP98katNurOx6LW5eDXAf1 5LazG/Aofg5XNb6nuSGFj7TUsWs51EF61r4pguBmqBIhKS8RfJQT1d2ejIasspBrrPRH LluwGuBHrD8435pwXrrZS7s9HYmfhIpyWHJY8ioOQeWKrjPSeJihHnTLin6S3WTC0srb QeIg==; 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=jnSs6Z9A; 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-5ac65d52376si4994439a12.536.2024.07.28.03.26.24; Sun, 28 Jul 2024 03:26:24 -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=jnSs6Z9A; 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 BC54868D91A; Sun, 28 Jul 2024 13:25:47 +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 9283A68D773 for ; Sun, 28 Jul 2024 13:25:36 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162336; bh=gsb4rP38XMMj9fPc5EjMQhLa82b/z9V+tnoqTQxzqTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jnSs6Z9Ade8FEclhLmGwTDMCz4mnCxZBWrLtzNYNExqS8m/hfmVKdeMuZE9J15eDl 1Fd52zCRZWNiorFm7h3mniSUSAP5O+YTzxfSAQXx2uDraCIpVYDBwroKrMCPzuuIOb o90YCJVm65LCebcIS1R+x+XMrAdRyVeBPRCnfwm4= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4D62D42563; Sun, 28 Jul 2024 12:25:36 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:10 +0200 Message-ID: <20240728102527.17991-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240728102527.17991-1-ffmpeg@haasn.xyz> References: <20240728102527.17991-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/22] avcodec/dovi_rpuenc: respect dv_md_compression 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: 6jKVNh7aNTSI From: Niklas Haas Limited mode can only ever maintain a single VDR RPU reference, and furthermore requires vdr_rpu_id == 0. So in practice, it will only ever use VDR RPU slot 0. All remaining slots get flushed in this case, to avoid leaking partial state. --- libavcodec/dovi_rpuenc.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 63cbde8718..2a6131eff5 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -464,12 +464,37 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } vdr_rpu_id = mapping->vdr_rpu_id; + use_prev_vdr_rpu = 0; + if (!s->vdr[vdr_rpu_id]) { s->vdr[vdr_rpu_id] = ff_refstruct_allocz(sizeof(AVDOVIDataMapping)); if (!s->vdr[vdr_rpu_id]) return AVERROR(ENOMEM); } + switch (s->cfg.dv_md_compression) { + case AV_DOVI_COMPRESSION_LIMITED: + /* Limited metadata compression requires vdr_rpi_id == 0 */ + if (vdr_rpu_id != 0) + break; + /* fall through */ + case AV_DOVI_COMPRESSION_EXTENDED: + if (s->vdr[vdr_rpu_id]) + use_prev_vdr_rpu = !memcmp(s->vdr[vdr_rpu_id], mapping, sizeof(*mapping)); + break; + case AV_DOVI_COMPRESSION_RESERVED: + return AVERROR(EINVAL); + } + + if (s->cfg.dv_md_compression != AV_DOVI_COMPRESSION_EXTENDED) { + /* Flush VDRs to avoid leaking old state; maintaining multiple VDR + * references requires extended compression */ + for (int i = 0; i <= DOVI_MAX_DM_ID; i++) { + if (i != vdr_rpu_id) + ff_refstruct_unref(&s->vdr[i]); + } + } + num_ext_blocks_v1 = num_ext_blocks_v2 = 0; for (int i = 0; i < metadata->num_ext_blocks; i++) { const AVDOVIDmData *dm = av_dovi_get_ext(metadata, i); @@ -504,7 +529,6 @@ 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, sizeof(*mapping)); if (num_ext_blocks_v1 || num_ext_blocks_v2) vdr_dm_metadata_present = 1;