From patchwork Sat Mar 23 19:19:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp369309pzb; Sat, 23 Mar 2024 12:26:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4UzSa78ArOVfYdfi6h4CUGnGFACefWp37Wweg6azjQhk3LrjJk0e9I2t0tSoofV+1Q3ByApAj+SlX0WFvL0R3QkRkdiKsuSfigA== X-Google-Smtp-Source: AGHT+IHYoH2KAnO+crqLLiql5AbyCNDTOstVMXEHWBZFEfYOox4HH92Of2Ooso+U7LVRLBUXTe7R X-Received: by 2002:a05:6512:220f:b0:515:a799:604e with SMTP id h15-20020a056512220f00b00515a799604emr315933lfu.41.1711221965559; Sat, 23 Mar 2024 12:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711221965; cv=none; d=google.com; s=arc-20160816; b=0ALUr+NF7swhMhxIAo4H8nB6L9IZoAtzYKkK4TrID/IcNY9B3gpQLCJOazJ9ZrC0Ww hDpq6xvCFVAbe5rfPyp0qakNTbLCa/RxHVyNKD+YBXqpCmObkcBXHYZjXKpC1o9TpgQb +rK1J0dEopn+rAp49aTWu+526GtMBDa5eqiMb8qp+43nb2LF75ia3cAr04yxE9KV8cfI MVAv7UUB1yRZms3kv7mmgeikH70/wfRmreRev69LZP0ty3MqgKwqwYuFQr9LXgrdTiuK IGaiSykC7CgQFClRTXN+gvPXxSM24TeZEHWEhWP+DvvH5VjBQGGBDAwnanQqF1JLYKX0 y9dA== 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=z++Paps/nEtwoI0bU+1rYDMXSeEIfOXL2KI/rhkvAXs=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=xc4vpvbikp0zxtBbA5VRk3IgdvqxMUPPXCMle7HK+Ktws848lEM9kGk/jP/eF7KDkS BrM8bcL/SHoKC4bn7hmW8dUiYREOApqWI1MSAyOm/5x8KGGNSAeGejwVPWtQq2LWO1Cm ofAd7GE0bTqLxR7/j3cf+ZmNT8zxL5yHqvRu1S84h7yic/OMt6QkA/xPUwFMgaDGIL/F 5l4b1IEqO8km0ZbwwPTj94qFQPkg5bWlIkGWj/dxW48vwMsflcDfmXy7Gq5Cqsom5QZw lPTAhHj7Cah3axDJ20cptmbEIKAk2LfC9zjHSn9Dpd6EdwoWnxKET/bLo+8Qnw66E3hQ KLCA==; 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=EcZpWbKR; 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 t9-20020a056402524900b0056bd49c466asi1073052edd.317.2024.03.23.12.26.04; Sat, 23 Mar 2024 12:26:05 -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=EcZpWbKR; 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 199A968D5CB; Sat, 23 Mar 2024 21:25:00 +0200 (EET) 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 358C268D4BA for ; Sat, 23 Mar 2024 21:24:49 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1711221885; bh=tQrJ4LbE58TvS/usAqwln4GDvyQnTY0OoExVnX/HCBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EcZpWbKR9/vFTnIbXPRpeuu8qq+MBKngiQi4K7jSF7G4zDRRJ5DMnDw1H7NmLHZlJ bGGiGYYsYPlBLRKqyhO9gR3VGtCeggYjl+noFobYBLHzlv5Pv6iyvfm1bhpRnWfDcs 9mx96ZNIkFxJhyrmEcI+/7q8LpwFNmbuBT323GVk= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 628AA4301F; Sat, 23 Mar 2024 20:24:45 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 20:19:57 +0100 Message-ID: <20240323192440.38264-9-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323192440.38264-1-ffmpeg@haasn.xyz> References: <20240323192440.38264-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 8/8] avcodec/dovi_rpu: attach ext blocks to frames 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: YbfPXW2+IXgi From: Niklas Haas --- libavcodec/dovi_rpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index b3defd87bda..2b4d2b470c2 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -94,7 +94,7 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) AVFrameSideData *sd; AVBufferRef *buf; AVDOVIMetadata *dovi; - size_t dovi_size; + size_t dovi_size, ext_sz; if (!s->mapping || !s->color) return 0; /* incomplete dovi metadata */ @@ -120,6 +120,9 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) 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); return 0; }