From patchwork Mon May 15 10:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 41625 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1515057pzb; Mon, 15 May 2023 03:51:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4htQjGDDC6+2VlaPHVuwtb3MI2qsgxqVCVTJcvON82oUD4PvALYdoRbAnHlbe6IVBfqAl2 X-Received: by 2002:a05:6402:150e:b0:50d:dcaa:6b7f with SMTP id f14-20020a056402150e00b0050ddcaa6b7fmr13493213edw.20.1684147890126; Mon, 15 May 2023 03:51:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684147890; cv=none; d=google.com; s=arc-20160816; b=Zz3CQMFVBZlI1y2ZcmJmSPLqYAHXgQJkkjPjh/vEFzbscCDPCOyydxHiIMVBtexui9 IoO0GPEoxjxP2WjttarODJidJpMt8iH7I/4xhlHcBm6MnL/MTsYt1K6UFYNb93jxx+0v xIbq1IGqE05a4wyMgYNtyjhy7c8YguWJwSMNhnqOYBx8x4qGUpGIPeYyJ1KMvzQ99b45 oTWHeG1gwvguP7we+WzfDFOsfmYODLpNoLQlj7Bq6yRsY9Xfj7Y4WKqXTYgI/KZcj3ox aS9Njq9HIgGWypnJ7OeF/JwOyVcV0TTu3LGFLDXpu83reTsnjOSRED0jNH+gWRypTIit zIdw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=NAwIY43HenqtKBp62JtLQbi5iY1eDME83uY15G8q5OA=; b=Jso7FaGqUU7P6xZD/ysjic9xpdgPIl+9VzxRyGRVFpHUmVIs5Gef++7M5AczNDNd3l r15NsuL3KDWKqMb6W1AnH1HXN6S3leOHdLt23a810s/KBKfyaFYVHBpZd1Aty+N6bsba kVDYjr6XaI08G3ViWDuHYd3NUFmk4J7lBFr57QmtZU7mvfT8Y8cJzHsjXI+u3bYNYQwZ n9f0YJV3x0wCAilBm8aKRfKc2JsxJXdfog11OnyXvyirYug7W5gsT2t6HZX1LXv0dtcH J/whJPml4rzW9ZEvYjSRRaZeClbJNLoT58TT6E6ElyAhL6XbOOmZ0NDBJrChOM8bJOgo VrXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=FR0EIVCp; 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 t26-20020a05640203da00b0050bc27a4977si9806108edw.110.2023.05.15.03.51.29; Mon, 15 May 2023 03:51:30 -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=FR0EIVCp; 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 D5F4268BFA1; Mon, 15 May 2023 13:51:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B40E68A661 for ; Mon, 15 May 2023 13:51:19 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-9659443fb56so1973285766b.2 for ; Mon, 15 May 2023 03:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684147878; x=1686739878; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CJnhVubOXQ6P+L7qAfcmWjuqZNuZBx6O5gJfZaMWtDU=; b=FR0EIVCpKXYZEba/hL2RUDKrVAW82+FcavwBvSCKD5ljqt8R/PEazl0MFrEfjy9jQy lGHr8RdvLW4olPbQxkKDtLR5wPbIiTb5sU1LI0k3WNpSF5ChZb74pX2V9OdKw+tNP2g1 3pUBkTvDQYXUBY6TtjN/7z769QtvNaRByy05C/Nt3Qon0fuZqyQCCOgzKZrx/dXanKST wUXfMmLnW3h5j56IELG/2jF8Das+Lyf4mdyALkD46xsZ7bT/LdrBFtvmxSaUBiemVD2V BfYp8KmpySu7o1HHZx8NP+TLfOyeaHUxbV1oe0I8g8G1TZ0q19fICybEoOrjEOJ/Yzyo HL+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684147878; x=1686739878; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CJnhVubOXQ6P+L7qAfcmWjuqZNuZBx6O5gJfZaMWtDU=; b=aYc3nFvfc5faasfiUVWc6M1GM6NcX8gZNCbXIV8RQXBYklNQQiZHP1RHQzFrLgDXMQ fjlHsePxygMjpDshmden59lrVvdaYoFGcusu+YNrkXd0GmwuCZkksyvWQ+AaT1Gq4WxO BBT+ysyZBr7tkszvu/7Mp2K4lb7/2ewWXDiKsK6QBBlBEBNqwsvxmYKGuuWJGPFOEIjj jZDJwWrjIXS+jZpKPdtxP7ALfd4+K0M6zrG1bndBNzRy1412q1poQzXUD4EEdXf8lOxA dqPUnue1S1oyfidnZZxnzvzU+yinghgnTr8ZSBk6ytFRhYv5BLuRAWeya9IhhwmUQdx0 8PcQ== X-Gm-Message-State: AC+VfDxMgAXCVYIMRBS1gnsHcvd1pgKbo7CZ6F9+eGDtlJw/B9h0MmKW 6v1G1FwVKySiNolCIh1+DROaO4RXC6c= X-Received: by 2002:a17:907:7dab:b0:967:a127:7e79 with SMTP id oz43-20020a1709077dab00b00967a1277e79mr23109427ejc.28.1684147878070; Mon, 15 May 2023 03:51:18 -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 hy25-20020a1709068a7900b0096607baaf19sm9342575ejc.101.2023.05.15.03.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 03:51:17 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 12:51:04 +0200 Message-Id: <20230515105104.1162-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.40.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/nvdec_mpeg2: 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: UsTuDX0WGmpg mpeg2dec stores them permutated for the IDCT, nvdec expects them in plain raster order. --- libavcodec/nvdec_mpeg12.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvdec_mpeg12.c b/libavcodec/nvdec_mpeg12.c index e10735587d..3b9ff60734 100644 --- a/libavcodec/nvdec_mpeg12.c +++ b/libavcodec/nvdec_mpeg12.c @@ -83,8 +83,9 @@ static int nvdec_mpeg12_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]; } return 0;