From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 20C3949AA2
	for <ffmpegdev@gitmailbox.com>; Thu, 28 Mar 2024 15:08:00 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0277B68D5CF;
	Thu, 28 Mar 2024 17:07:59 +0200 (EET)
Received: from haasn.dev (haasn.dev [78.46.187.166])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F8D068D5B2
 for <ffmpeg-devel@ffmpeg.org>; Thu, 28 Mar 2024 17:07:52 +0200 (EET)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail;
 t=1711638472; bh=sFw1A3Iqtrdp67YoFx7Z9a4SW83LkualiFk6PcvHcPw=;
 h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
 b=tsgHkSsa+KexEz9LcfIhdstomptuqjyWqAhJFMD7N5fVmbNEqRozh/+L0Y+EcfRNa
 J8AhaxVYXHhT8fXXt82h+0JM6DMoDyUKB1mCm75qifIskL7WyONdmpaxJ0V+glqtUg
 G5O2CQbkTmC817s5Z02QnyjZUKiAXj0Xj3Ya4P/8=
Received: from haasn.dev (unknown [10.30.0.2])
 by haasn.dev (Postfix) with ESMTP id 452CD40BD5;
 Thu, 28 Mar 2024 16:07:52 +0100 (CET)
Date: Thu, 28 Mar 2024 16:07:52 +0100
Message-ID: <20240328160752.GB53978@haasn.xyz>
From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
In-Reply-To: <20240323192440.38264-9-ffmpeg@haasn.xyz>
References: <20240323192440.38264-1-ffmpeg@haasn.xyz>
 <20240323192440.38264-9-ffmpeg@haasn.xyz>
MIME-Version: 1.0
Content-Disposition: inline
Subject: Re: [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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Niklas Haas <git@haasn.dev>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20240328160752.GB53978@haasn.xyz/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

On Sat, 23 Mar 2024 20:19:57 +0100 Niklas Haas <ffmpeg@haasn.xyz> wrote:
> From: Niklas Haas <git@haasn.dev>
> 
> ---
>  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);

Forgot to set dovi->num_ext_blocks = s->num_ext_blocks, fixed.

>      return 0;
>  }
>  
> -- 
> 2.44.0
> 
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".