mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpeg2: fix quantisation matrix construction.

Browse source
This commit is contained in:
Gwenole Beauchesne 2012-01-06 16:44:09 +01:00
parent 697a2804e1
commit a591dc3b72
1 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
View file

@ -242,43 +242,24 @@ ensure_quant_matrix(GstVaapiDecoderMpeg2 *decoder, GstVaapiPicture *picture)
}
iq_matrix->load_intra_quantiser_matrix = intra_quant_matrix != NULL;
if (intra_quant_matrix) {
iq_matrix->load_intra_quantiser_matrix = 1;
if (intra_quant_matrix)
copy_quant_matrix(iq_matrix->intra_quantiser_matrix,
intra_quant_matrix);
}
iq_matrix->load_intra_quantiser_matrix = 1;
copy_quant_matrix(iq_matrix->intra_quantiser_matrix,
priv->seq_hdr.intra_quantizer_matrix);
iq_matrix->load_non_intra_quantiser_matrix = non_intra_quant_matrix != NULL;
if (non_intra_quant_matrix)
copy_quant_matrix(iq_matrix->non_intra_quantiser_matrix,
non_intra_quant_matrix);
iq_matrix->load_non_intra_quantiser_matrix = 1;
copy_quant_matrix(iq_matrix->non_intra_quantiser_matrix,
priv->seq_hdr.non_intra_quantizer_matrix);
iq_matrix->load_chroma_intra_quantiser_matrix = chroma_intra_quant_matrix != NULL;
if (chroma_intra_quant_matrix)
copy_quant_matrix(iq_matrix->chroma_intra_quantiser_matrix,
chroma_intra_quant_matrix);
iq_matrix->load_chroma_intra_quantiser_matrix = 0;
iq_matrix->load_chroma_non_intra_quantiser_matrix = 0;
if (priv->has_quant_matrix_ext) {
if (priv->quant_matrix_ext.load_intra_quantiser_matrix)
copy_quant_matrix(iq_matrix->intra_quantiser_matrix,
priv->quant_matrix_ext.intra_quantiser_matrix);
if (priv->quant_matrix_ext.load_non_intra_quantiser_matrix)
copy_quant_matrix(iq_matrix->non_intra_quantiser_matrix,
priv->quant_matrix_ext.non_intra_quantiser_matrix);
if (priv->quant_matrix_ext.load_chroma_intra_quantiser_matrix) {
iq_matrix->load_chroma_intra_quantiser_matrix = 1;
copy_quant_matrix(iq_matrix->chroma_intra_quantiser_matrix,
priv->quant_matrix_ext.chroma_intra_quantiser_matrix);
}
if (priv->quant_matrix_ext.load_chroma_non_intra_quantiser_matrix) {
iq_matrix->load_chroma_non_intra_quantiser_matrix = 1;
copy_quant_matrix(iq_matrix->chroma_non_intra_quantiser_matrix,
priv->quant_matrix_ext.chroma_non_intra_quantiser_matrix);
}
}
iq_matrix->load_chroma_non_intra_quantiser_matrix = chroma_non_intra_quant_matrix != NULL;
if (chroma_non_intra_quant_matrix)
copy_quant_matrix(iq_matrix->chroma_non_intra_quantiser_matrix,
chroma_non_intra_quant_matrix);
return GST_VAAPI_DECODER_STATUS_SUCCESS;
}