aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2023-05-15 13:33:18 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2023-05-15 18:48:57 +0200
commit410ccbbe8c6171b0c751d8d05f1edf999916b700 (patch)
tree61e6a10f2dd606d4d8e21221a97956c355614d9d
parent865eca9321d67b358b9ff62361891aebbcaccd5c (diff)
downloadffmpeg-410ccbbe8c6171b0c751d8d05f1edf999916b700.tar.gz
avcodec/nvdec_mpeg4: fix order of quant matrix coefficients
The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware.
-rw-r--r--libavcodec/nvdec_mpeg4.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/nvdec_mpeg4.c b/libavcodec/nvdec_mpeg4.c
index 739b049933..5404e4e330 100644
--- a/libavcodec/nvdec_mpeg4.c
+++ b/libavcodec/nvdec_mpeg4.c
@@ -86,8 +86,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