From patchwork Mon Jun 24 17:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2158753vqz; Mon, 24 Jun 2024 10:27:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXkSX4du8SRfOMZrFVdlV5EJ2rzH5jZdeX/tGYJQcCTpyi0t/Vn0qehTPexoddntHYoDSXIE43mwESHZi2ZpAh2kIPj8btKOsqX1w== X-Google-Smtp-Source: AGHT+IEpe8oKFkJfGXT68MxZCMcsZY1+rZRz0F/xr94oAnERnmTgbDmEl6VrbI3iQhkoXjwDhh64 X-Received: by 2002:a17:906:4acb:b0:a6f:1fd6:61b6 with SMTP id a640c23a62f3a-a7245baca18mr324659666b.35.1719250068752; Mon, 24 Jun 2024 10:27:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719250068; cv=none; d=google.com; s=arc-20160816; b=aEuFHqd2Bn0NhJWNdC/9WqL4x2A+ITYX/UJaaL8AVCpqd4xcN6R3fu+/K4kN4DzfIZ cL3IHbZSggbwhjXS3vcxnNi5P7H2iCWQiYA5iHydouLMhcfh2f3YPDOdMtCsF2DHQf9b BKx4S0Mds+ZI+xcigos+aiQ/10sGHtdiKMPrHvTMkmZF/6rn3fuuCyOjZlU/5K+85TfF Ke2tHLh5su0ixAqIbsmqA52ObvTg1yfWgSrpcKsZz0izl+qMfCqryyC63S07L03GM3uC 8Iu7cW74uxtQpl3gOTwrqEZxnjJc04sJV/6r7WpL81jaNrEQacgDiFJwcMw+vEhfpwSz wGCw== 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=l7Kgn92PVWnR5da8dHksoZ03wrE4CldG44Gw2VXvIyE=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=X+ozAmEj5hmAxhbvNNowQ7Paf6Q6ZrPCWLANyWE2W9+fdUk5UEygSSWPS8dSYAFG/0 I3L5POgcnxpMCMuBEXaKThEq8YUMslx8Ri1ASSL1Q0TtduQuUSuhL3b31BnTXfPRDPBC KIAkYY6fa8SPuBlpy1jjEDpAeFuIG/wrR4TF3RNrTnhwW7zJ08eVw9QctKvP77sTrYej YXpuSqmhHWh1KJVO//L4f8wnRZgcLZMIqRY3d1ROCJ3+Yd303Xl38C1g8EIUG4d2sCjl qW0E0Ho1JZMEy742/30cPNNOC4wqXPMSHsBua8+Gw07aqt3cn5mCbCxLtB1529GSz3cD 9aVg==; 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=eYbIo3Wi; 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-a725ee8c150si64902866b.249.2024.06.24.10.27.48; Mon, 24 Jun 2024 10:27:48 -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=eYbIo3Wi; 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 4AA3C68D641; Mon, 24 Jun 2024 20:21:05 +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 5E38C68D5B8 for ; Mon, 24 Jun 2024 20:20:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1719249649; bh=X61jJi+O6kosuevQKEbSH7bNCI9lMjGlFknPvPTkzQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eYbIo3Wihqt1TMFGutd/XS9SQUIxwZmQ+BEcfwtpTEOy/wq9cLT2RTsbpvdeJnF+r gGCcSWUPG4E8Pre5r1/KZlua6zLcDYJtC/sbw147rsP7/yb0l31DA/rsOaveOHOjZx neF2f0nmos90fN4D6jk5e8/Z1NVQX/3L/CVWJiGg= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 3C2F846FFE; Mon, 24 Jun 2024 19:20:49 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 19:20:42 +0200 Message-ID: <20240624172044.101722-7-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 7/9] avcodec/dovi_rpuenc: disable metadata compression by default 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: +ukYIiUEXB2m From: Niklas Haas Keyframes must reset the metadata compression state, so we cannot enable metadata compression inside the encoders. Solve this by adding a new flag, rather than removing it entirely, because I plan on adding a bitstream filter for metadata compression. --- libavcodec/dovi_rpu.h | 3 +++ libavcodec/dovi_rpuenc.c | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 226a769bff..f0d9c24379 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -126,6 +126,9 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx); enum { FF_DOVI_WRAP_NAL = 1 << 0, ///< wrap inside NAL RBSP FF_DOVI_WRAP_T35 = 1 << 1, ///< wrap inside T.35+EMDF + + FF_DOVI_COMPRESS_VDR = 1 << 2, ///< enable VDR RPU compression + FF_DOVI_COMPRESS_ALL = FF_DOVI_COMPRESS_VDR, }; /** diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 41080521e1..08170a9e84 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -21,6 +21,7 @@ */ #include +#include #include "libavutil/avassert.h" #include "libavutil/crc.h" @@ -452,9 +453,10 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, const AVDOVIRpuDataHeader *hdr; const AVDOVIDataMapping *mapping; const AVDOVIColorMetadata *color; - int vdr_dm_metadata_present, vdr_rpu_id, use_prev_vdr_rpu, profile, + int vdr_dm_metadata_present, vdr_rpu_id, profile, buffer_size, rpu_size, pad, zero_run; int num_ext_blocks_v1, num_ext_blocks_v2; + int use_prev_vdr_rpu = false; uint32_t crc; uint8_t *dst; if (!metadata) { @@ -475,12 +477,21 @@ 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] && !cmp_data_mapping(s->vdr[i], mapping)) { - vdr_rpu_id = i; - break; - } else if (s->vdr[vdr_rpu_id] && !s->vdr[i]) { - vdr_rpu_id = i; + if (flags & FF_DOVI_COMPRESS_VDR) { + for (int i = 0; i <= DOVI_MAX_DM_ID; i++) { + if (s->vdr[i] && !cmp_data_mapping(s->vdr[i], mapping)) { + use_prev_vdr_rpu = true; + vdr_rpu_id = i; + break; + } else if (s->vdr[vdr_rpu_id] && !s->vdr[i]) { + vdr_rpu_id = i; + } + } + } else { + /* Flush VDRs to avoid leaking old state after keyframe */ + for (int i = 0; i <= DOVI_MAX_DM_ID; i++) { + if (i != vdr_rpu_id) + ff_refstruct_unref(&s->vdr[i]); } } @@ -524,7 +535,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;