diff options
| author | Sreerenj Balachandran <sreerenj.balachandran@intel.com> | 2014-07-28 11:14:22 +0300 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2016-04-15 01:22:52 +1000 |
| commit | 7b0b74041ed24b4b7ab4cfb0217059cd88f4b72e (patch) | |
| tree | 4a67839102ecb4f1e3f0d2ad8f7c655f6afd6ca4 /gst-libs | |
| parent | a16c27895b71ee9a18ca6992f1116b4fe4a0ec21 (diff) | |
| download | gstreamer-plugins-bad-7b0b74041ed24b4b7ab4cfb0217059cd88f4b72e.tar.gz | |
codecparsers: mpegvideo: Add more fields to the GstMpegVideoSequenceHdr
Added the fields load_non_intra_quantiser_matrix and
load_chroma_intra_quantiser_matrix to the sequence header structure.
https://bugzilla.gnome.org/show_bug.cgi?id=733872
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/codecparsers/gstmpegvideoparser.c | 9 | ||||
| -rw-r--r-- | gst-libs/gst/codecparsers/gstmpegvideoparser.h | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gst-libs/gst/codecparsers/gstmpegvideoparser.c b/gst-libs/gst/codecparsers/gstmpegvideoparser.c index debafa094..868684f43 100644 --- a/gst-libs/gst/codecparsers/gstmpegvideoparser.c +++ b/gst-libs/gst/codecparsers/gstmpegvideoparser.c @@ -296,7 +296,6 @@ gst_mpeg_video_packet_parse_sequence_header (const GstMpegVideoPacket * packet, { GstBitReader br; guint8 bits; - guint8 load_intra_flag, load_non_intra_flag; g_return_val_if_fail (seqhdr != NULL, FALSE); @@ -339,8 +338,8 @@ gst_mpeg_video_packet_parse_sequence_header (const GstMpegVideoPacket * packet, READ_UINT8 (&br, seqhdr->constrained_parameters_flag, 1); /* load_intra_quantiser_matrix */ - READ_UINT8 (&br, load_intra_flag, 1); - if (load_intra_flag) { + READ_UINT8 (&br, seqhdr->load_intra_quantiser_matrix, 1); + if (seqhdr->load_intra_quantiser_matrix) { gint i; for (i = 0; i < 64; i++) READ_UINT8 (&br, seqhdr->intra_quantizer_matrix[i], 8); @@ -348,8 +347,8 @@ gst_mpeg_video_packet_parse_sequence_header (const GstMpegVideoPacket * packet, memcpy (seqhdr->intra_quantizer_matrix, default_intra_quantizer_matrix, 64); /* non intra quantizer matrix */ - READ_UINT8 (&br, load_non_intra_flag, 1); - if (load_non_intra_flag) { + READ_UINT8 (&br, seqhdr->load_non_intra_quantiser_matrix, 1); + if (seqhdr->load_non_intra_quantiser_matrix) { gint i; for (i = 0; i < 64; i++) READ_UINT8 (&br, seqhdr->non_intra_quantizer_matrix[i], 8); diff --git a/gst-libs/gst/codecparsers/gstmpegvideoparser.h b/gst-libs/gst/codecparsers/gstmpegvideoparser.h index 1298ed78f..4d76be145 100644 --- a/gst-libs/gst/codecparsers/gstmpegvideoparser.h +++ b/gst-libs/gst/codecparsers/gstmpegvideoparser.h @@ -211,7 +211,9 @@ typedef struct _GstMpegVideoPacket GstMpegVideoPacket; * @bitrate_value: Value of the bitrate as is in the stream (400bps unit) * @bitrate: the real bitrate of the Mpeg video stream in bits per second, 0 if VBR stream * @constrained_parameters_flag: %TRUE if this stream uses contrained parameters. + * @load_intra_quantiser_matrix: %TRUE indicates the presence of intra_quantiser_matrix * @intra_quantizer_matrix: intra-quantization table, in zigzag scan order + * @load_non_intra_quantiser_matrix: %TRUE indicates the presence of non_intra_quantiser_matrix * @non_intra_quantizer_matrix: non-intra quantization table, in zigzag scan order * * The Mpeg2 Video Sequence Header structure. @@ -226,7 +228,9 @@ struct _GstMpegVideoSequenceHdr guint8 constrained_parameters_flag; + guint8 load_intra_quantiser_matrix; guint8 intra_quantizer_matrix[64]; + guint8 load_non_intra_quantiser_matrix; guint8 non_intra_quantizer_matrix[64]; /* Calculated values */ |