From patchwork Mon May 15 11:39:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 41626 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1542804pzb; Mon, 15 May 2023 04:40:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QzIyp+YecV68bXBpvhOVBaq0gB363OwoRK+AEiWKPQg8IhBUYi2Syx8do9jnuzgK8EO0U X-Received: by 2002:a17:907:62a6:b0:95f:64d8:f795 with SMTP id nd38-20020a17090762a600b0095f64d8f795mr29219864ejc.27.1684150854759; Mon, 15 May 2023 04:40:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684150854; cv=none; d=google.com; s=arc-20160816; b=l36A6BwXOqt3YQKmyJx8Y+71mm7dCKTh0pfkKwE0eIddJJiEGe1Ze7EgFNI/iFOdB2 fkQvSozTlbcFN9g398WQr5MFKKpfPOWTV/3cPfwKtxCMmpAWw7Lwk/I0scjGtxiLfK3I 9zQJa5I5alfU7xUnreHXWBmAuE+37C4rtx6+4w6tB5uDb40wQmn5z/iNwiDmDuzI85/5 6Lu2V8Y9RF7jA8iOR3PigWsuAB4za9kzGNVGqjAH9v/IHiSz7I8bW2i7r4rzLzCXhWjr ZMTJrMHREu9hZKDaFsIxQq+gVY8MNxGXSaoyxz86NvbYuWwC3R52gP2rPvCrZIGA8ZNw i+iw== 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=n2hIxa8i/IUT4yhZbBrwfsceX87CTX3M18dCdMZwDiU=; b=RVtwUsI7wpiOGgpuLK7axt5qp5tQIjQ9SOCY0iUHquKJXqXevlkw8f4thCZ9u+I8cZ x4HMUzx14sOqcWgcr3p3Uw8FtKFmIdt9FP4vb+2ES6zcFUy/97FytEk+0w4J84kNE7R/ 4a18mBsqgucVrO6vAoFVr5QynaY31T32EDBD9QCaEmj6g+t/c8Agp2zl4z+KfgEmyPiJ CcMUDoLuc73zitjHbKk7IivnkOWsXJLLJh6S2d68Cr+9x73DgTRPg8xJT9WXaL34J8F4 0UmRT1tFs4BGiuutAZdspyRm2XzuCOc7C6K2Yok+gdurl0bPX4QFhyPqFC79qEICfGo4 eolg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=nqSFubQ6; 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 z27-20020a170906075b00b00965bd5151a7si11014170ejb.127.2023.05.15.04.40.54; Mon, 15 May 2023 04:40:54 -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=nqSFubQ6; 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 3FC9368BCE9; Mon, 15 May 2023 14:40:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4842368B076 for ; Mon, 15 May 2023 14:40:44 +0300 (EEST) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-50bd2d7ba74so110587695a12.1 for ; Mon, 15 May 2023 04:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684150843; x=1686742843; 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=zrTCpKLzWcQWGpC+XTDdi987+ULU9LNN69F4x4Fcfrw=; b=nqSFubQ6iPFdDQB0YReStqjFO4PEWornsnBNRqLm1M3u3xAPxZ6z36Nfi8mHQGz3X/ yQJt2WJHypS+tVAmZq/ZrVuDMgXzuvt7S08oIN3c/ukYN61vkaNBFCTnCnmJHQHxRNPO q2cF5T7oZnaXXn9t8YAKGXj+yDoRm8A7WRkM+/jjAb0wawGtwy2ZODdv3jW3GBfn6a6Q 6Wcuuz35tOqsa8IKRcz5VssxsQr6f0DTGSY+CcM7PivN9YLY3vHy8VTmfEhjVg+xEbHX zxDfiYWwitzo+NDZREzJcek92hUD3zwmYIFfvbjUSS+seOJlld17fWu4WuJ8+q0wnQRT EPdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684150843; x=1686742843; 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=zrTCpKLzWcQWGpC+XTDdi987+ULU9LNN69F4x4Fcfrw=; b=d/DIj/xWz4EZLRSx/5Jx/xx+LlgdwJ5OtyQPhn7ANZ05KttZuIPo0UzhLiWQsq/eTX r58is5sjMQq4Bv82WhzXm+Z6ExoRO7TtmYQkJnTdkUEz1NhfliSutcaoQFLouhhr9F1C 8GJuTrjYrlHAl+kZa8eLzf0tV0GBB9yTvvp14eBch6FpTPK/LW4Rbmc7Rw1M3cgAYlL/ B7KW/AAoDAAJBCoAOFht7SLaXOvjHjMTGHTgFJW1zgNbiqzGrUIrtLd4fPY+cTevI+PF P4kJsIoUT4S+x0p1ZTgxuAVYg7HJMqQ5WrSYGeSuZIScgySsJT7uUpc1t/YnHX/aqCTm a7bg== X-Gm-Message-State: AC+VfDw+242lk8PWVS+12q1bJnvSbkJkh98kfOn8PVL6HRgds7efvxrR 94Z0bMnL7pg6WGcAKLW+3rlLPqQzBD0= X-Received: by 2002:a17:907:c17:b0:965:ae3a:52c8 with SMTP id ga23-20020a1709070c1700b00965ae3a52c8mr33864597ejc.32.1684150842882; Mon, 15 May 2023 04:40:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 04:40:42 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 13:39:08 +0200 Message-Id: <20230515113911.1232-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.40.1.windows.1 In-Reply-To: <20230515105104.1162-1-h.leppkes@gmail.com> References: <20230515105104.1162-1-h.leppkes@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] 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: kznaD2bMTu/h 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_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; 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 From patchwork Mon May 15 11:39:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 41628 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1543019pzb; Mon, 15 May 2023 04:41:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6k6toF33rJvCziOLCDXHOGCWRNGOEHYpftrq97pO5KydXlNmFebWFp4koNsm/C12Jr+AAJ X-Received: by 2002:a17:907:7250:b0:965:ff38:2fbb with SMTP id ds16-20020a170907725000b00965ff382fbbmr31868181ejc.1.1684150874185; Mon, 15 May 2023 04:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684150874; cv=none; d=google.com; s=arc-20160816; b=b0fuRAsGiw1cNiGLsWv7faVgkigIdngXctvh6bUxs6imu5wpDaBOip5aVUjRn3hcP3 U2r6gV86Dy2M36SSHtjIEv4TrcoH1O4WWGYHwDYqoQVIMKY85CHASeEkqA7+FaHAcPmb U1esDi4FAtbpf8MwryByFzePeNmDumEggbnS2Lr/Nr/p06mjn5peJJ4W/akiottzDCS1 bv/sHqfVtQNGaJ2w36yhMZL52qJkbKLD0u/NqQLVWzd7elTq/WEAGw5VarFCFsVfBBK5 2TxkyLt1kaH0UJqN1bpWAd3HeDCbEpK0dtpa4G7V7AbGXmjMmiSdxrrwESVZowu8vUiG 5xZA== 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=y9ddOq1D/7aKLrFz79Sr5FqL718Oye0dwDzCy6SpGYE=; b=hitjJZoKWQMq4gRi1JIgWbFJWNAyL5YazdVyly/mdeOtJiHSw55awW0gZk9V8oXkVO mYmpHkosWEdfN7TprPFMgPLIhzTvhpVmn2Mjn7OX60r/ZD9aMd4Mt8lFFwxWtjUB9DTc +/X9/Pz9DJpEEsSAVqXuDPnOBg2I3aXDkletPB8DyxPFdUg/0U84JOXF/if2l3jVki0Z baRKk9IqQRZ1USlVp8q8rya0h9Z9TsAVpMzJl/dOB+ov6r0IxsTj8VQI+e8FxOBVnVUL NUetB1o4iNH+c/d3K2XySJXLdO9mORYZNQsWZwVE7heaM6hZY2Hd81MrS2Hm1GtkpcqG NBiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="W+/QxJyL"; 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 ju23-20020a17090798b700b0096628b28a04si11613773ejc.780.2023.05.15.04.41.13; Mon, 15 May 2023 04:41:14 -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="W+/QxJyL"; 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 C0FEE68B806; Mon, 15 May 2023 14:40:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2F9968BD12 for ; Mon, 15 May 2023 14:40:51 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-50bc570b4a3so22893423a12.1 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=1684150851; x=1686742851; 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=nnXgifxlpLr2P19YWRCTCfafBHqOidJ7Zvlth4jck54=; b=W+/QxJyLPlp1lFJbCjL2LKog+TyP3aQzxJeXZFq9qB91TQVfJxHBoHI/pxhfIP4Uvv CNssSWPWhAjZKFMcC6O7/YocvNyxTt3YjeGMm5jMWVNxmGVe5VafKT2gD+efJcdlIDP3 pkH1OnhN1z5ug69XRXsdThaPmP7SL84F/g1d6JtSY+6eGr8CHkcpbFdRPv5yox9CwmaG bIbkWIoWzBuB5Tzp9jJIVuCEY6ibKffiHUTJ30BXp0ZNlCWoyRXKK5QidWpkv2Ko7ebU gXHc26i7E3buHdOw/NYmdv/67sdwIS4r8J6c+yK+Wkm1dsb3+KRUDw3oTcbNy+RrpH/h N50g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684150851; x=1686742851; 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=nnXgifxlpLr2P19YWRCTCfafBHqOidJ7Zvlth4jck54=; b=VF0RDBASCPYeMc9VTmiR4dEVFpgD7lTrR4OeKuJ5y/2xau+G2WkZt9ybO1VXWAE/Nz K7wgJjMqvLyRVuQpKvY9+NBztilewrhIqnWYoQP3khy0ehonXx7nNUcoUAElNHzx1Srt YzOoYO7hugKYw167dz1BkiJ9tSztl1MxG/0bl2hWJZT+K2wkvTqz22asNJ6pk6H3cQW0 Chrt+cZpV9dWTsdMTdJJDteO6nGMXU+roS9bNmulCjJCOp0gr7AMgsyAn4fBculHpc32 h67M8U6+wsvSI6V9/R5ZPfXwz82JK23yaCF9aGO4Yf33gTm8TXDh7hrtw6usSLpAG0Pt u1aw== X-Gm-Message-State: AC+VfDwX9ExqCJD1QD9EuH83G8jmNoKdCaZp0ya8wtWtAcYZ9Jd+y+c0 rJW1HNJH6qGlQOUmMFrfupCxhRXF4l4= X-Received: by 2002:a17:907:72d6:b0:8b1:7de3:cfaa with SMTP id du22-20020a17090772d600b008b17de3cfaamr32823132ejc.3.1684150850465; Mon, 15 May 2023 04:40:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 04:40:50 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 13:39:10 +0200 Message-Id: <20230515113911.1232-3-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 3/4] avcodec/vdpau_mpeg12: 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: IRT62Onbl1Qe 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/vdpau_mpeg12.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index 354239cad5..79007aa1a8 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -75,8 +75,9 @@ static int vdpau_mpeg_start_frame(AVCodecContext *avctx, info->f_code[1][0] = s->mpeg_f_code[1][0]; info->f_code[1][1] = s->mpeg_f_code[1][1]; for (i = 0; i < 64; ++i) { - info->intra_quantizer_matrix[i] = s->intra_matrix[i]; - info->non_intra_quantizer_matrix[i] = s->inter_matrix[i]; + int n = s->idsp.idct_permutation[i]; + info->intra_quantizer_matrix[i] = s->intra_matrix[n]; + info->non_intra_quantizer_matrix[i] = s->inter_matrix[n]; } return ff_vdpau_common_start_frame(pic_ctx, buffer, size); From patchwork Mon May 15 11:39:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 41629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1543108pzb; Mon, 15 May 2023 04:41:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6jcLb6Ee9KrRG2d2JSbW1nB9mJ4jLrn6VX8OjdhwZU4OVSnipbWJWyJVFYzcLy0TmWwnfz X-Received: by 2002:a17:906:db03:b0:965:4b43:11f1 with SMTP id xj3-20020a170906db0300b009654b4311f1mr29192919ejb.3.1684150883953; Mon, 15 May 2023 04:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684150883; cv=none; d=google.com; s=arc-20160816; b=gioVGO82iBd/PzA6ltUoRHyyBk26oXjCfHByBm58P/inOOU0pbtctDI9VkeGzAkAWL Z2s8fk24U09WsZtBPtGPmodvNqbueK1v3L/k2gTn6WGrZK9wp/L92gRUNqGYhU4CLDWm EOjXousorZfUVdRnChM8FaPOCvbKc6gsV5nGvCKj0F7MmiD36IEot4IJAymSF76+QpvM B910uhN1uu1NI3TGaq4FxyGjjxUQInWDFtPh15Ud1AaN21+9OGyoMFR2UKMfTKV7obiy /H/DvLeJ0/5a2nM7WY+1A0ffCAcNim0KIxiepSHYLVpwur5S8iMXIbkT8Tk5Nheaac3j C1pA== 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=L7LwTr2DZNSSTMRmansB3/fvnxpG0Hnj2YEhvC7y8Mg=; b=KYaeF6U0904E5PoQmfPhP5KVAqRg/wKgFnsygxB3pWlswUFhTAqZv5nG0pAZBptGho +STl5wHp/D1Q4eRaUPY03PiS89DYnCMpnLvFbbfxWzl3rGaHgi9r20ZfIns84x/JQNWx gkhKDxqznWpPOLwJxBk/kU/Uj++xGjq1oM8uyO/Hnb8IzWqJi7VxEIHkk08MjLYzQ6nN SPLddISkmk+oxakFr04IkyKyD7VDzowpW2/esqJ34EcoX4eT9i14c9tkIgb1Wec7tjCF GRJhw3OfAyIF9Sd594jzTuUczRu4+Iwugbn8CDaICSk8GYzKJY3bxg/E4lg9Cfb68EF/ fJKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=GYXP21Df; 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 x5-20020a170906804500b0094f201d3030si9868204ejw.1027.2023.05.15.04.41.23; Mon, 15 May 2023 04:41:23 -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=GYXP21Df; 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 C5EE468BEB9; Mon, 15 May 2023 14:40:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 256AB68BD03 for ; Mon, 15 May 2023 14:40:52 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-50db91640d3so11287301a12.0 for ; Mon, 15 May 2023 04:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684150851; x=1686742851; 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=nhzJ3m6RbR+goWEKReIGk1qQShSA6D0TxG/hKXwo5tY=; b=GYXP21Df35twH+/aZmuG3RHy+GmUOvn46LUL3Cj7ycKFjjKqU6U52E5KNO3b3VVViY 9gr2/JqOUfTXhT3SMgUj5aUsryWcYQfa9ibMzH4xnKWwR55Q8nTPFhYlyflRlkIhA9vr Ti9M05WsqhogjXeo0swyR3MeoUU5VSJ5dfrFgNcx8gQF6Vn+YRdSIggLuSyC1VAYWYZQ 4AGrRpUIkfQU9/yKo9zGjDgyeEU2tRCE+1NeWXelNpPhH4E4ymIbOFQDYv22Jq15g8TV Teoo8ExOy7k7atOyQYGzsdvH9cW1VhX/YVE6OCgkorW+DevQlTTmVcYsG1v1+48CcdWq oMqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684150851; x=1686742851; 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=nhzJ3m6RbR+goWEKReIGk1qQShSA6D0TxG/hKXwo5tY=; b=FQFAnHau/knMjPlbLAVlYnRUXW4fencYpTk7+N3M2zmDytFn9xRKsqfN81+wnZ0x4O KBjJfOz1scRaDdF/zWWlHGA7Fl4FUkirOrhTvo6yFrDzdUTC81YG2ZtBCmi46sGzmtwF ctlP+XMg2J7qPMcXytY/4v/jbG8bcoi3ufb2cmhiji5rTjflfaYuZxLJXN0YSqV0Y3ku jk9xD+LgHFXZ5b0yVqW/XP5O2fgBO+mfQhOm6DwdMQdnYj17b8ej7LQb99DKiFz6lLKt MfwSiVToj/MwpcltoaQtR1WX6Wlcg8KarFNYhq/aRGc+os4ogQ+4uDiqfaP+qCtLuxov vXRQ== X-Gm-Message-State: AC+VfDwB1qiMutOzZT7ctLrJlhRBPtT03N//gp9gxaEQYv+mfvi3xhVy oVWcHq6xFzUqYN/wCJBhWW/we+OgY0I= X-Received: by 2002:a17:907:26c1:b0:96b:1c38:477c with SMTP id bp1-20020a17090726c100b0096b1c38477cmr3213560ejc.57.1684150851129; Mon, 15 May 2023 04:40:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 04:40:50 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 13:39:11 +0200 Message-Id: <20230515113911.1232-4-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 4/4] avcodec/vdpau_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: Xyu3thhoumpL 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/vdpau_mpeg4.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 6e082eefc6..1211b1df2c 100644 --- a/libavcodec/vdpau_mpeg4.c +++ b/libavcodec/vdpau_mpeg4.c @@ -74,8 +74,9 @@ static int vdpau_mpeg4_start_frame(AVCodecContext *avctx, info->alternate_vertical_scan_flag = s->alternate_scan; info->top_field_first = s->top_field_first; for (i = 0; i < 64; ++i) { - info->intra_quantizer_matrix[i] = s->intra_matrix[i]; - info->non_intra_quantizer_matrix[i] = s->inter_matrix[i]; + int n = s->idsp.idct_permutation[i]; + info->intra_quantizer_matrix[i] = s->intra_matrix[n]; + info->non_intra_quantizer_matrix[i] = s->inter_matrix[n]; } ff_vdpau_common_start_frame(pic_ctx, buffer, size);