From patchwork Wed Nov 25 23:00:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 24038 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D4A3844A25A for ; Thu, 26 Nov 2020 01:00:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB59168BAAD; Thu, 26 Nov 2020 01:00:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE4DA68B979 for ; Thu, 26 Nov 2020 01:00:19 +0200 (EET) Received: from w3.tutanota.de (unknown [192.168.1.164]) by w4.tutanota.de (Postfix) with ESMTP id 8B0FB10602E0 for ; Wed, 25 Nov 2020 23:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1606345219; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=/N0XqCI7gI3CGrlnZLlEb5gqJHEN4g7EsJWj3DPfQ2Q=; b=1n0bWLX3198uFET6bmSWnFqYM4GAFIJLcRo2iK3vAOk+mMIxCNjW0c2syzvybMPm QPKb1i3zkYwIgjs6ANFf3HlVUNahEKIPwDqBwr7jWDkwOBkIlSOftpVbbn79xQC81t8 174KmeDnmP1y+XOK5v7fDzwhRA/Xbf5KidiNnv+GWX/+acum5JFCMExc2AKJxeEWXOj r2tuiq5ahw4GmE1AvbDSj7aOS2lY55H1S+d4Ky/3YzPLJMpdg7bYOK+PKVJHx27+YY2 AYoKE633XiwzOjrMmoVmJSfmqiclkPUUWqkbD8k8Sy0ashPSmKjcodeW5lRm+934Z89 6+9qvnkuoQ== Date: Thu, 26 Nov 2020 00:00:19 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libdav1d: correctly copy ar_coeffs_uv to our struct X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Our struct is a [2][25], libdav1d's is a [2][25 + 3] so the last 3 v coefficients were missing. Copy each plane's coefficients separately. Patch attached. Subject: [PATCH] libdav1d: correctly copy ar_coeffs_uv to our struct Our struct is a [2][25], libdav1d's is a [2][25 + 3] so the last 3 v coefficients were missing. Copy each plane's coefficients separately. --- libavcodec/libdav1d.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index c9b439a007..04587b88da 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -425,8 +425,10 @@ FF_ENABLE_DEPRECATION_WARNINGS sizeof(fgp->codec.aom.uv_points)); memcpy(&fgp->codec.aom.ar_coeffs_y, &p->frame_hdr->film_grain.data.ar_coeffs_y, sizeof(fgp->codec.aom.ar_coeffs_y)); - memcpy(&fgp->codec.aom.ar_coeffs_uv, &p->frame_hdr->film_grain.data.ar_coeffs_uv, - sizeof(fgp->codec.aom.ar_coeffs_uv)); + memcpy(&fgp->codec.aom.ar_coeffs_uv[0], &p->frame_hdr->film_grain.data.ar_coeffs_uv[0], + sizeof(fgp->codec.aom.ar_coeffs_uv[0])); + memcpy(&fgp->codec.aom.ar_coeffs_uv[1], &p->frame_hdr->film_grain.data.ar_coeffs_uv[1], + sizeof(fgp->codec.aom.ar_coeffs_uv[1])); memcpy(&fgp->codec.aom.uv_mult, &p->frame_hdr->film_grain.data.uv_mult, sizeof(fgp->codec.aom.uv_mult)); memcpy(&fgp->codec.aom.uv_mult_luma, &p->frame_hdr->film_grain.data.uv_luma_mult,