From patchwork Sun Jul 28 10:25:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50791 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp585114vqi; Sun, 28 Jul 2024 03:37:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgYfUa3Hz7Zy1lAvCt1rl2lLsjYMRd3WQwFqM7mGNo90/Pzubo0UgwBt8XZu6C7bvGYmq+UTe0zkwKTsyR3/6rKhJf8SGgu+GKBw== X-Google-Smtp-Source: AGHT+IHpm1+WbYU7l30okBYCcgR7j0uejRvJJJwYN1dPsTzc/LiEPVw8xFD0l6J1aF1Q2nuRakJF X-Received: by 2002:a17:906:da8e:b0:a7a:aa35:409a with SMTP id a640c23a62f3a-a7d401cd9acmr310176566b.68.1722163021495; Sun, 28 Jul 2024 03:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722163021; cv=none; d=google.com; s=arc-20160816; b=T4cDGsK4fpxsz5cZFodsbRRFslphGk/+FePeITFzCXXmgcuLjgXQBzsmHI+ddI9Xr7 bLBUybatpQ0l9vrnd9l0mRI6/UYChwYMAZHCn8BXeTio9TG2U74ddhepWWVyrjcNLnUP 0lkw4o2sTTvswkzMr/RdTdTNNnTPFag5i3mez1zTMThF2VGUxpWi7Ot4un/hjwGfDhSX 1ISbmaBbxi/b/APTYXovlaoEcNdiReysYZC7DSYYVthjgNvvZXpfrrebObFzX8ZJK+uV FLCys28w20DYNwpONQik0TtPKQr1GNm6fyr1EcmnzdOtKqJv96EPuk2S7hXj7NADXjZA tUDg== 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=bJ9y8gXFM3nDxfNYAN2L1JETYgZws/eMfcZ15vzOPXc=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=nJXPgw2egZtTke8RpePXMIWP3ZB5pf8RbzgH668+Kdp+InQeaIM66dt9r/SP3Ex60w 2fvhNs0Ir4vEXcwTMs8Atk+rK8DWzyoxgzMXVxKYWnCg84zMiVAn5VY8N0NrDgWsDst3 abudufPxltcVmdgwnFQz6N7TxZAcld7/pHA77LvXWX+sWkN4DbTqtBswpdSvTT7WDqla 8pFy4CrIRkteAmSWpW4Zur6T4iuO85VQklMLJMFxX4iSI0hSsvuRpdJE1aoEutfj26TM DbP2Rlnagc1QhGwIj+Yz0hrPwNDeKX7gc+ivYbSZkv03RPKFotMqCBIIUTPT3qcV4K1O m9kg==; 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=KmTI+1T4; 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-a7acab3b1d0si487328666b.360.2024.07.28.03.37.00; Sun, 28 Jul 2024 03:37:01 -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=KmTI+1T4; 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 3CDEF68D987; Sun, 28 Jul 2024 13:26: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 8A6FE68D90F for ; Sun, 28 Jul 2024 13:25:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162337; bh=EU0E3FwQVe/A1BAwcpsKlRRx+/iNt5Au6PIbfxCuQ9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KmTI+1T44ASHr8AxVTqxnf2g5YXS+xWMW4k8GqnEBZ7UyIbT0r8JLS8hynT+Zv1gF f9g6hGTs/QThvqcvKG3FyljeOUt0AguTV0hv3wiOfeysx58kznFCkFat1Ki9dqx1VT jEyXHpQCQ/5OhbnI6taQnBMqOio15udyMd5xie0g= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id EDBE442AB2; Sun, 28 Jul 2024 12:25:36 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:13 +0200 Message-ID: <20240728102527.17991-8-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 08/22] avcodec/dovi_rpuenc: add a flag to enable 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: IXBWv7SMSTIm From: Niklas Haas Keyframes must reset the metadata compression state, so we need to also signal this at rpu generation time. Default to uncompressed, because encoders cannot generally know if a given frame will be a keyframe before they finish encoding, but also cannot retroactively attach the RPU. (Within the confines of current APIs) --- libavcodec/dovi_rpu.h | 1 + libavcodec/dovi_rpuenc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 226a769bff..e2e7635cfb 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -126,6 +126,7 @@ 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_RPU = 1 << 2, ///< enable compression for this RPU }; /** diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 73db9437a0..0d4e613a72 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -444,6 +444,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, int vdr_dm_metadata_present, vdr_rpu_id, use_prev_vdr_rpu, profile, buffer_size, rpu_size, pad, zero_run; int num_ext_blocks_v1, num_ext_blocks_v2; + int dv_md_compression = s->cfg.dv_md_compression; uint32_t crc; uint8_t *dst; if (!metadata) { @@ -463,6 +464,9 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, return AVERROR_INVALIDDATA; } + if (!(flags & FF_DOVI_COMPRESS_RPU)) + dv_md_compression = AV_DOVI_COMPRESSION_NONE; + vdr_rpu_id = mapping->vdr_rpu_id; use_prev_vdr_rpu = 0; @@ -472,7 +476,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, return AVERROR(ENOMEM); } - switch (s->cfg.dv_md_compression) { + switch (dv_md_compression) { case AV_DOVI_COMPRESSION_LIMITED: /* Limited metadata compression requires vdr_rpi_id == 0 */ if (vdr_rpu_id != 0)