From patchwork Mon May 15 11:39:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 41627 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1542900pzb; Mon, 15 May 2023 04:41:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4QiIPmyMR4a3syjHzG61mgZtsiEK9u3QGG1pfGnBrg8EQ6Df0I+jYW9+1Ohagcj8D8ibWx X-Received: by 2002:a17:907:2d0c:b0:966:5c04:2c5a with SMTP id gs12-20020a1709072d0c00b009665c042c5amr26166507ejc.69.1684150864705; Mon, 15 May 2023 04:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684150864; cv=none; d=google.com; s=arc-20160816; b=r2qRZpSoOLq6eeim3fVcovIkJI+gRAgvjp21cTLBbNZ/50i0GQay8cHwgeJdXMuPdx XQVYvPS9b+6ZPKkSS0CwMcJdjPXZZiuqVUzKkJFrWYbH7Br9StDHTvX+trDW+BVR75H7 ilDm2MwaTyDJu4CO07P7pfKfeDP0k+3zctmG2G0WFgWhYwrFxVEqUTjPSJse2VKBWR7G +oViZM3sp03CRbgsKJ38sXaFspxW1FA5LdrfldKOmGCNcA2Hvh1laGFdYps8eUx1BQyA V0geqo6UQQAEZji0uFYavxMQu28iZXTKNYqKjxl0aoaKmIffHVxMUCvihVVtEfW348M3 2yxg== 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=DHYS8MrngFyqhtixPCToKXSyh58/5sEGwULiWdMH5yQ=; b=DRZpM23kWJeO2tA5L+/88SvEIhgs9+xxwYzUtQAvOZBgh2Zj/VELAWF10S32n08bSX PkERQvbwCPkUHLFaHugOtdvZwy85EbeeasrBlSW8qBgdTPT3onMj+NujXGoZkhIKtD2q cVZ62BNVEmQDzsP9jKzVdOrZehx2Y/n1blhREPELONs1MB/8OhO+b0BK9WH/ILlcGaFF Vu9YGgfvuS8igWer1rR/cBWAMsEacyPvR9s7h0KmQiJyecoPE4xhZKS8gzDdMJon/rgS 46UlOTf85jLJWqXuyKtOXKytcx8LvNNpPfsoEj6Ft98/9KUSbCDpfujNJ8XocIi6p8nc xo3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=XiHRGKtB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u24-20020a1709063b9800b0094ee6a7c86fsi11226438ejf.95.2023.05.15.04.41.04; Mon, 15 May 2023 04:41:04 -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=@gmail.com header.s=20221208 header.b=XiHRGKtB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 914ED68BD51; Mon, 15 May 2023 14:40:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F66668B806 for ; Mon, 15 May 2023 14:40:51 +0300 (EEST) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-96b0235c10bso301676166b.3 for ; Mon, 15 May 2023 04:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684150850; x=1686742850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=05qapLhL+2HH+LT2Z2GKg//wKuUCZpTjc0cvbylwDiY=; b=XiHRGKtBdXFOgIJfEm06LTu0UAE1o30o4Pz1gAPlXaz7e1BjPK+H7atuB43RwKADKV emuo8S7SZ/PlcBfht8mYg9ACq1xsfS8/7BEousfp52zoTTyZ+6dH2LmecFNjKDNujln3 C/amgeO5eZkXLdl1tI0UxfiTXxmuQwIlIswcHEPr8jOLml64cdS+aT4MTtAHg6wH9VhJ jfwHqt5bmaFdx+hc/307xwBEiPhxE7TT+UneEm9OReW2TZ0ykkWGjMTDTIiPcTXkZqZM 0NnxvIh/J3cY4uxgLEXawHBQt7EO2HJQQS706MYcwXe81habfrFpd8QhPL4GqaR8m/4c vZvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684150850; x=1686742850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=05qapLhL+2HH+LT2Z2GKg//wKuUCZpTjc0cvbylwDiY=; b=KIKRElMXnl+tk8q2Xz5le1fmA2qn8Ihw/BFkA1mMTi9CBh1LcuAdMYB5ofT9efjasB 4bH7y3/YRAAYCnY98zon1XlfxVlgdoDAEhlgGdk5DyBlCMk8wQ3duus4X78bvn+rdbrG kC1SCskW/5R7tbrWFvPzmBlx9Bf8tL7UTOwSQkDq+9Asz2GhRzr80tBmPtVFgd3+yB+0 49uQDH0KRlCJFK0OffpUFuuAAK1DkN101xI50gMyIvs7eYUcO/I1UgCF/XApdVe8Blfo raPEYO1dNcdz5e5x8eDBkQg+BzbQ7u5EL/wYEfLJTOta9MzHwvIXgS4Mn7eiVp5POGxJ WIHg== X-Gm-Message-State: AC+VfDydh2qvzK+0E7oNCaX3Rns1apZ1WqtzJN5cBNo2aT/Ma2x9fO+U 1G/tGW2Re1MsWsyKqSbL/u4l44nFIX4= X-Received: by 2002:a17:906:fe04:b0:966:1984:9d21 with SMTP id wy4-20020a170906fe0400b0096619849d21mr25464014ejb.9.1684150849946; Mon, 15 May 2023 04:40:49 -0700 (PDT) Received: from localhost.localdomain (p200300ccf71d220048ad1895e6601426.dip0.t-ipconnect.de. [2003:cc:f71d:2200:48ad:1895:e660:1426]) by smtp.gmail.com with ESMTPSA id gx8-20020a1709068a4800b00965ab02b42csm9332532ejc.102.2023.05.15.04.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 04:40:49 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 13:39:09 +0200 Message-Id: <20230515113911.1232-2-h.leppkes@gmail.com> X-Mailer: git-send-email 2.40.1.windows.1 In-Reply-To: <20230515113911.1232-1-h.leppkes@gmail.com> References: <20230515105104.1162-1-h.leppkes@gmail.com> <20230515113911.1232-1-h.leppkes@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/nvdec_mpeg4: fix order of quant matrix coefficients 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: Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +FITCS/Lv5vR The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware. --- libavcodec/nvdec_mpeg4.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvdec_mpeg4.c b/libavcodec/nvdec_mpeg4.c index eac138cc38..c193f6b6e4 100644 --- a/libavcodec/nvdec_mpeg4.c +++ b/libavcodec/nvdec_mpeg4.c @@ -88,8 +88,9 @@ static int nvdec_mpeg4_start_frame(AVCodecContext *avctx, const uint8_t *buffer, }; for (i = 0; i < 64; ++i) { - ppc->QuantMatrixIntra[i] = s->intra_matrix[i]; - ppc->QuantMatrixInter[i] = s->inter_matrix[i]; + int n = s->idsp.idct_permutation[i]; + ppc->QuantMatrixIntra[i] = s->intra_matrix[n]; + ppc->QuantMatrixInter[i] = s->inter_matrix[n]; } // We need to pass the full frame buffer and not just the slice