From patchwork Tue Jun 18 19:35:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2780283vqg; Tue, 18 Jun 2024 12:43:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzeBtIaKEv73c6rmI8M/hRnXTAi3bqSLF0zEy6PrNe650HNAekCHZxgTLIIvYdCPQ6x6RYcADpf/HrdEWH1o1W5vs2nwihm6EH4g== X-Google-Smtp-Source: AGHT+IEsxtNPOchbtW9stk87mAkCRjZu0nR9fWOkfSJrVEo3A//giRKiqqIn2U5VclvCLU28rFPt X-Received: by 2002:a50:8e09:0:b0:57c:74ea:8d24 with SMTP id 4fb4d7f45d1cf-57d07e7b20fmr253760a12.18.1718739811225; Tue, 18 Jun 2024 12:43:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718739811; cv=none; d=google.com; s=arc-20160816; b=AoLIx9pmZx3N8lPbXX5zHnz9f1LTnJlh+rfj0usVJU/Ig/FyAgB7AIhfuP8+7m9jIj vb4wGyBoObyZBK0yWnkjhpu2AIqg3b8a/EvobdWTvzsTgXwAaVHw1Ax/2YB6lsfpB82N VR8SGQIgXQ1nWK1OL2A+s7MzlqLPcoZO9N3t6iTEvPaaJn17szeFPreyR0lviCmIxjm3 nrbv6JP1Xj6bDz2RJ1P0JNaBbJk2daXuf+IGh8m+HGwuof+oOWp3Zn4opF0Ldxm46g8o AvwbhPV6p8YCi3VjjnzwEBR+zy4FcqnZ883YCpXsLRpo22Khmy7RJFyp6BCOKc52cqah lFsA== 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=an3Ps+rLugRlIXlfytp4sUTKxnRPPhj1WKOhQcMPmQk=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=EPGSBeGUYKxAmn3w0B8plKsAqSla6WBKfZqKzDZ3yBC0mWt2LdhNssyO1VT3izVg0u LCGAku42VXAJwh0HUR9iNprRWzh/j4O2Oy+RK/y1bcJTFVpUyQnYMaMLh3kV0tq9Sp4r UEvi2t32jaW3Sp5jbRX/bbey69a2NGZKvFhrpjHQFvdrqOMiq+Z+4E+0y2YZjXAk6s1w hlqBZ97WPBvmSV5OGYbhO6VbuGIE2OCbrqsCRpmpa1aR5Z1AwNCsVbXgZpdVkvJw8CVU YdIWj4N5fQKjbNoGqH7KFIR4HI1wmyHetw6JqKtjSA1MYEpO50AREJa61caRfCHBvpqE x/Xg==; 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="MPWw/gC8"; 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-57d0a1f475fsi97896a12.83.2024.06.18.12.43.30; Tue, 18 Jun 2024 12:43:31 -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="MPWw/gC8"; 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 AB01568D7C5; Tue, 18 Jun 2024 22:42:39 +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 D4C6168D74C for ; Tue, 18 Jun 2024 22:42:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1718739744; bh=TK/lCaffdmXZ6OjGBISLpJxdKB3yEQtRVp03UMG0MBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MPWw/gC8Wm7XTdEYN60b+BIVecbDOF1GDeJTSXirpP6WIQQiZTsPhKOT7Itx9W0Ro CIPhVZc5+o/zzaOgn6Q0uHoaqzKzZKmy8om9n4uH2/cCf4GjbSojcx1K1F+nHwWH37 dINXHTjnUodUkmOJnXH0VtT6v0njpGZVntf0w5Mc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id BBF6043C7A; Tue, 18 Jun 2024 21:42:24 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 21:35:36 +0200 Message-ID: <20240618194221.26073-7-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240618194221.26073-1-ffmpeg@haasn.xyz> References: <20240618194221.26073-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] 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: RhKIespiFDZ0 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 | 27 +++++++++++++++++++-------- 2 files changed, 22 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 65c36ed0ae..631733c620 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" @@ -441,9 +443,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) { @@ -464,12 +467,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] && !memcmp(s->vdr[i], mapping, sizeof(*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] && !memcmp(s->vdr[i], mapping, sizeof(*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]); } } @@ -513,7 +525,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;