From patchwork Tue Jun 18 19:35:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50010 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2780352vqg; Tue, 18 Jun 2024 12:43:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWYA6xm/GKh3JWgBZ6o29Sc2xxcBpWP6DRMuQlk6zYPMNpCKTlUwJRQ4lJL5CivRHsDBy/rGR1f0VX50qNSEQfaJgBxAIVhYXKPpg== X-Google-Smtp-Source: AGHT+IG7sKD0b40oYpp4WJFFRNn0Lm+Y8sxUNtI49vrk4KhOLNgQjfazduoYEr9gDglBN4Xe5gS/ X-Received: by 2002:a50:8747:0:b0:57c:db99:a131 with SMTP id 4fb4d7f45d1cf-57d07ed3a27mr257828a12.29.1718739821498; Tue, 18 Jun 2024 12:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718739821; cv=none; d=google.com; s=arc-20160816; b=oprZz+0k/8JD7W9IEunuvcYhaJVO9vctmVfr8goR8dmyIfT8M3aWll4wn8VXLKrb9Z jerTUOye0a5xBOHj0wzPXAzsQ1NhbbrawmdvScXTLc/O6Ra9UglytmMPIC+1coli8Mqc tmFedNG6aUSB5uCw57h0V3T3pc3GtlhL3yIzaTvDesYNtl6bdFKPCKpHITILKXDK7D1H s0x+yt+Bak0dV8iiSLC6zrAnw1XKSm73DM4F0zfw2k+WPJgzzYz8sKw8r5HjQ6EJW2Uk u1qAaurvbFkL/+Ph2ZPtENY6yHiBJfBMqL7hJTGI+2Lp/RfP+es7en2U3rN4guSgXJdD 9l+Q== 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=41HZVri/iKr3ho0wJTWa1bGobgHGxAXZR60xmjOjsgI=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Khb3ixHaR6e6r1aKP+w4d50gL5RrNYbOCYvjqxC1kypLLa3AzRkJPXxltInvkPIEQh FZQZ3addJ2gEi8ifS3wI2PU3WetIVv5AC3PVmg93YG0A5z26w4ZwU8xEvZyC80Y5Y5Nv sXyfDfp7UXwU9hTIKxoD5qQfN+AA5Z995Uucel77IJSemwBpUb8D5OjdxheV0K86KLls hzpkSggop53Ad+uWj/9E3M5twZwv6BYqPafYje3Uucvk3zyjC/p+/nxY72OVuRhJaU6Z w8IjgHyQGfOyNNbiMh4ucGrYzqHLzsngDH3KRgfAxc5HRlb/iRu7SFTAI65c1QQ98RN4 7wCg==; 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=BoZSE2OE; 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-57cb745d999si5567841a12.508.2024.06.18.12.43.40; Tue, 18 Jun 2024 12:43:41 -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=BoZSE2OE; 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 0CDCA68D7CA; Tue, 18 Jun 2024 22:42:42 +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 10D1268D74A for ; Tue, 18 Jun 2024 22:42:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1718739745; bh=hG2jtCAke188aBhpt3uLoBch24zeZnFMXt8qG0vwutw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BoZSE2OEEXADrgKpYteUcxBxWz3tvtscquuWbQy5s4WLZPp9FvBzigQo01+y6RXtC pGQE2vfYS4qN5VvthfIgY+pJ8c/+t9wM6qe7mRsov+cW61ONEkPN8/V8dEJXC2+wLo Y3KmVMmpyEjqUXuZCChJW8aOO2WHcDGqHbrT6xoI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 01EE743E93; Tue, 18 Jun 2024 21:42:24 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 21:35:37 +0200 Message-ID: <20240618194221.26073-8-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 7/8] avcodec/dovi_rpu: add ff_dovi_get_metadata() 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: GT4lCESS8p4Y From: Niklas Haas Provides direct access to the AVDOVIMetadata without having to attach it to a frame. --- libavcodec/dovi_rpu.h | 9 +++++++++ libavcodec/dovi_rpudec.c | 40 +++++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index f0d9c24379..10d5c7f566 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -108,8 +108,17 @@ void ff_dovi_ctx_flush(DOVIContext *s); int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, int err_recognition); +/** + * Get the decoded AVDOVIMetadata. Ownership passes to the caller. + * + * Returns the size of *out_metadata, a negative error code, or 0 if no + * metadata is available to return. + */ +int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata); + /** * Attach the decoded AVDOVIMetadata as side data to an AVFrame. + * Returns 0 or a negative error code. */ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame); diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index b34c3116b7..1e2ad4fd3d 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -30,10 +30,8 @@ #include "get_bits.h" #include "refstruct.h" -int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) +int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata) { - AVFrameSideData *sd; - AVBufferRef *buf; AVDOVIMetadata *dovi; size_t dovi_size, ext_sz; @@ -44,7 +42,32 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) if (!dovi) return AVERROR(ENOMEM); - buf = av_buffer_create((uint8_t *) dovi, dovi_size, NULL, NULL, 0); + /* Copy only the parts of these structs known to us at compiler-time. */ +#define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last)) + COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, disable_residual_flag); + COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots); + COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); + ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size); + for (int i = 0; i < s->num_ext_blocks; i++) + memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz); + dovi->num_ext_blocks = s->num_ext_blocks; + + *out_metadata = dovi; + return dovi_size; +} + +int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) +{ + AVFrameSideData *sd; + AVDOVIMetadata *dovi; + AVBufferRef *buf; + int size; + + size = ff_dovi_get_metadata(s, &dovi); + if (size <= 0) + return size; + + buf = av_buffer_create((uint8_t *) dovi, size, NULL, NULL, 0); if (!buf) { av_free(dovi); return AVERROR(ENOMEM); @@ -56,15 +79,6 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) return AVERROR(ENOMEM); } - /* Copy only the parts of these structs known to us at compiler-time. */ -#define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last)) - COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, disable_residual_flag); - COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots); - COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); - ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size); - for (int i = 0; i < s->num_ext_blocks; i++) - memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz); - dovi->num_ext_blocks = s->num_ext_blocks; return 0; }