From patchwork Sun Jul 28 10:25:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp599182vqi; Sun, 28 Jul 2024 04:22:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWxgVl6iWqEW3Uy5mHPCHGRd+JQTafoW0GQoAAZ01J0JIP5YKbBmdwq+A1k7Urf0xPczDKGpILmTKnfYP2HzLP/lTXn/gEYtE7P+g== X-Google-Smtp-Source: AGHT+IH56RybCX9siCp0aMrTjBVDN+7aLk5/EoisohaYrTMrLKlTynUPtMLyX35yqFE9lSJhRhiT X-Received: by 2002:a17:907:3f23:b0:a7a:9ece:ea67 with SMTP id a640c23a62f3a-a7d3ffadd54mr335239966b.9.1722165720587; Sun, 28 Jul 2024 04:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722165720; cv=none; d=google.com; s=arc-20160816; b=JlFMRGoSwXaUnAIBhUUt9kEjGEx+S7dvJ43bObUK7qo9H0zkoDQML0dVY37XPiiYt2 ndx1DKHeLqX3JbKGbQ28A5P0zgRpkiwTsiH1hNUnDiAyqNXj7RFe6606xt+LObiGwtVT BRSaUVlj8U9RN45aGQEd98aMbVLNZsoqTgj/TrXi3q0yC+ksiRlzoqKgjM5YDnI/J9Y2 3XAXW84IBVU/oqjc3BH+bxjQPeM9yCxlxIlg3uAmPRSX0jjx1je7FY5rS/5dUX9BLi2V SXzJCDNHs6H1UX1YwjIEhKtmoPFVi6Vuka7WQFCitR8t7CNsBzP5TaQ8t5cF8ps7Min+ oICA== 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=Kj62cVMf9Y7/YmevtT3EQb8ixDkxeLqEfQKhrtw7Odg=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Ce5CoVfJMX6ySxEupEIouGZ6vPtROFzsxhnY9tsAZVWAvtvOaADtXojastqdqWVtlz Mxpn+i+3i/mYf/YEEvJXwL56+y6UrFIXwPoWf22P4pvrsJd1ARGOipgMWMiq8iWAm9Ip HbWHPpXibzFPz+rj+uIzGSEeEfk+1/neBff8n7gasxWt0zYJbiO5jrR7eHIRUkkOIR8T zapIqy9yfWHqfxPVEgLIVq/gVFTB6WPpArfWYCi8b94LcVJOQU/P0FwqDlX1DvKAGQIp pnZqeLMmo2QFSbfeMZGA+HOt6ZdrgjSv0PReTy8AVNN48yIQ0MRh/TYv8kL5iSBxoduJ RyNQ==; 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=n7EcnT9c; 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-a7acab3e0cfsi494494666b.366.2024.07.28.04.22.00; Sun, 28 Jul 2024 04:22:00 -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=n7EcnT9c; 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 8CF2068D8DD; Sun, 28 Jul 2024 13:26:02 +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 8281068D909 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=DQADt4JrtCsGns91D+yB2ETS1CBBhwOAaSH3tFuR3y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n7EcnT9cDmGUAqv+AnajvcqaxsiZNICWdC0W733USsuFr3FUVFS8jqWMM+fBir1Ta 8rejdYSThTJ3koaK+xdv0wmeqTIgjfvlOMpQKxjQTpi8u3Y5YhwOArk4x3oLhir3rR DE3CvivCHS+F6CCG/+MDcwqZdXLo1EtJSnHH2lH4= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2BA8942AE1; Sun, 28 Jul 2024 12:25:37 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:14 +0200 Message-ID: <20240728102527.17991-9-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 09/22] 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: sHlXiU8VufYP 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 e2e7635cfb..4eb4bc0873 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 bf6e5075d1..0ddc923539 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, ext_mapping_idc_5_7); + 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, ext_mapping_idc_5_7); - 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; }