From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A7A454C46A for ; Sun, 28 Jul 2024 10:26:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6540168D8F9; Sun, 28 Jul 2024 13:25:47 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".