diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-10-05 11:43:48 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-10-06 09:14:52 +0200 |
| commit | e29442e4417b2f949a1f481723fc4e4c7e3a0340 (patch) | |
| tree | ebd0215df88098709e0c59aa9faf76b0eb8df09b | |
| parent | 950381b55037ff1ce9d197bd25156fbfc6f69721 (diff) | |
codecparsers: vc1: fix stride for bitplane_decoding().
| -rw-r--r-- | gst-libs/gst/codecparsers/gstvc1parser.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c index ae6c01b2e..db7487abf 100644 --- a/gst-libs/gst/codecparsers/gstvc1parser.c +++ b/gst-libs/gst/codecparsers/gstvc1parser.c @@ -705,7 +705,7 @@ calculate_framerate_bitrate (guint8 frmrtq_postproc, guint8 bitrtq_postproc, } static inline void -set_mb_size (GstVC1SeqHdr * seqhdr, guint width, guint height) +calculate_mb_size (GstVC1SeqHdr * seqhdr, guint width, guint height) { seqhdr->mb_width = (width + 15) >> 4; seqhdr->mb_height = (height + 15) >> 4; @@ -777,7 +777,8 @@ parse_sequence_header_advanced (GstVC1SeqHdr * seqhdr, GstBitReader * br) gst_bit_reader_get_bits_uint16_unchecked (br, 12); advanced->max_coded_width = (advanced->max_coded_width + 1) << 1; advanced->max_coded_height = (advanced->max_coded_height + 1) << 1; - set_mb_size (seqhdr, advanced->max_coded_width, advanced->max_coded_height); + calculate_mb_size (seqhdr, advanced->max_coded_width, + advanced->max_coded_height); advanced->pulldown = gst_bit_reader_get_bits_uint8_unchecked (br, 1); advanced->interlace = gst_bit_reader_get_bits_uint8_unchecked (br, 1); advanced->tfcntrflag = gst_bit_reader_get_bits_uint8_unchecked (br, 1); @@ -1664,7 +1665,7 @@ gst_vc1_parse_sequence_header (const guint8 * data, gsize size, return parse_sequence_header_advanced (seqhdr, &br); /* Compute MB height and width */ - set_mb_size (seqhdr, seqhdr->struct_c.coded_width, + calculate_mb_size (seqhdr, seqhdr->struct_c.coded_width, seqhdr->struct_c.coded_height); return GST_VC1_PARSER_OK; @@ -1726,7 +1727,8 @@ gst_vc1_parse_entry_point_header (const guint8 * data, gsize size, READ_UINT16 (&br, entrypoint->coded_height, 12); entrypoint->coded_height = (entrypoint->coded_height + 1) << 1; entrypoint->coded_width = (entrypoint->coded_width + 1) << 1; - set_mb_size (seqhdr, entrypoint->coded_width, entrypoint->coded_height); + calculate_mb_size (seqhdr, entrypoint->coded_width, + entrypoint->coded_height); } if (entrypoint->extended_mv) |