diff options
author | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2010-07-14 11:19:05 +0200 |
---|---|---|
committer | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2010-07-14 11:19:49 +0200 |
commit | b3ad9d7d04bf83efada50f71671898ef86908b61 (patch) | |
tree | 3f9ff630abe7c74069378d6a60aae4de4de47db5 /sys/vdpau | |
parent | c27468f1a1fa1f3a4f4221afac6de4bfe22d8496 (diff) | |
download | gstreamer-plugins-bad-b3ad9d7d04bf83efada50f71671898ef86908b61.tar.gz |
vdpaumpegdec: rename zigzag matrix
Diffstat (limited to 'sys/vdpau')
-rw-r--r-- | sys/vdpau/mpeg/mpegutil.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/vdpau/mpeg/mpegutil.c b/sys/vdpau/mpeg/mpegutil.c index b0c122405..cce3411c9 100644 --- a/sys/vdpau/mpeg/mpegutil.c +++ b/sys/vdpau/mpeg/mpegutil.c @@ -24,7 +24,7 @@ #include "mpegutil.h" /* default intra quant matrix, in zig-zag order */ -static const guint8 default_intra_quantizer_matrix[64] = { +const guint8 default_intra_quantizer_matrix[64] = { 8, 16, 16, 19, 16, 19, @@ -42,8 +42,7 @@ static const guint8 default_intra_quantizer_matrix[64] = { 83 }; -guint8 mpeg2_scan[64] = { - /* Zig-Zag scan pattern */ +const guint8 mpeg_zigzag_8x8[64] = { 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, @@ -79,7 +78,7 @@ guint8 mpeg2_scan[64] = { if (!gst_bit_reader_get_bits_uint64 (reader, &val, nbits)) { \ GST_WARNING ("failed to read uint32, nbits: %d", nbits); \ goto error; \ -} \ + } \ } static void @@ -214,7 +213,7 @@ mpeg_util_parse_sequence_hdr (MPEGSeqHdr * hdr, GstBuffer * buffer) if (load_intra_flag) { gint i; for (i = 0; i < 64; i++) - READ_UINT8 (&reader, hdr->intra_quantizer_matrix[mpeg2_scan[i]], 8); + READ_UINT8 (&reader, hdr->intra_quantizer_matrix[mpeg_zigzag_8x8[i]], 8); } else memcpy (hdr->intra_quantizer_matrix, default_intra_quantizer_matrix, 64); @@ -223,7 +222,8 @@ mpeg_util_parse_sequence_hdr (MPEGSeqHdr * hdr, GstBuffer * buffer) if (load_non_intra_flag) { gint i; for (i = 0; i < 64; i++) - READ_UINT8 (&reader, hdr->non_intra_quantizer_matrix[mpeg2_scan[i]], 8); + READ_UINT8 (&reader, hdr->non_intra_quantizer_matrix[mpeg_zigzag_8x8[i]], + 8); } else memset (hdr->non_intra_quantizer_matrix, 16, 64); @@ -399,7 +399,7 @@ mpeg_util_parse_quant_matrix (MPEGQuantMatrix * qm, GstBuffer * buffer) if (load_intra_flag) { gint i; for (i = 0; i < 64; i++) { - READ_UINT8 (&reader, qm->intra_quantizer_matrix[mpeg2_scan[i]], 8); + READ_UINT8 (&reader, qm->intra_quantizer_matrix[mpeg_zigzag_8x8[i]], 8); } } else memcpy (qm->intra_quantizer_matrix, default_intra_quantizer_matrix, 64); @@ -409,7 +409,8 @@ mpeg_util_parse_quant_matrix (MPEGQuantMatrix * qm, GstBuffer * buffer) if (load_non_intra_flag) { gint i; for (i = 0; i < 64; i++) { - READ_UINT8 (&reader, qm->non_intra_quantizer_matrix[mpeg2_scan[i]], 8); + READ_UINT8 (&reader, qm->non_intra_quantizer_matrix[mpeg_zigzag_8x8[i]], + 8); } } else memset (qm->non_intra_quantizer_matrix, 16, 64); |