codecparsers: VC1: Some cosmetics and debug logging enhancements

This commit is contained in:
Thibault Saunier 2011-10-04 17:39:00 -03:00
parent ef5b8ef581
commit 8090627581
2 changed files with 13 additions and 8 deletions

View file

@ -401,9 +401,11 @@ decode_vlc (GstBitReader * br, guint * res, const VLCTable * table,
} }
} }
GST_DEBUG ("Did not find code");
failed: failed:
{ {
GST_DEBUG ("Could not decode VLC returning -1"); GST_WARNING ("Could not decode VLC returning");
return FALSE; return FALSE;
} }
@ -421,6 +423,8 @@ bitplane_decoding (GstBitReader * br, guint8 * data,
guint x, y, v; guint x, y, v;
guint8 *pdata = data; guint8 *pdata = data;
*is_raw = FALSE;
GET_BITS (br, 1, &invert); GET_BITS (br, 1, &invert);
invert_mask = -invert; invert_mask = -invert;
@ -438,7 +442,7 @@ bitplane_decoding (GstBitReader * br, guint8 * data,
case IMODE_DIFF2: case IMODE_DIFF2:
invert_mask = 0; invert_mask = 0;
// fall-through /* fall-through */
case IMODE_NORM2: case IMODE_NORM2:
GST_DEBUG ("Parsing IMODE_DIFF2 or IMODE_NORM2 biplane"); GST_DEBUG ("Parsing IMODE_DIFF2 or IMODE_NORM2 biplane");
@ -476,7 +480,7 @@ bitplane_decoding (GstBitReader * br, guint8 * data,
case IMODE_DIFF6: case IMODE_DIFF6:
invert_mask = 0; invert_mask = 0;
// fall-through /* fall-through */
case IMODE_NORM6: case IMODE_NORM6:
GST_DEBUG ("Parsing IMODE_DIFF6 or IMODE_NORM6 biplane"); GST_DEBUG ("Parsing IMODE_DIFF6 or IMODE_NORM6 biplane");
@ -1773,13 +1777,13 @@ gst_vc1_parse_frame_layer (const guint8 * data, gsize size,
* gst_vc1_parse_frame_header: * gst_vc1_parse_frame_header:
* @data: The data to parse * @data: The data to parse
* @size: the size of @data * @size: the size of @data
* @entrypoint: The #GstVC1EntryPointHdr to set. * @framehdr: The #GstVC1FrameHdr to fill.
* @seqhdr: The #GstVC1SeqHdr currently being parsed * @seqhdr: The #GstVC1SeqHdr currently being parsed
* @bitplanes: The #GstVC1BitPlanes to store bitplanes in or %NULL * @bitplanes: The #GstVC1BitPlanes to store bitplanes in or %NULL
* *
* Parses @data, and fills @entrypoint fields. * Parses @data, and fills @entrypoint fields.
* *
* Returns: a #GstVC1EntryPointHdr * Returns: a #GstVC1ParserResult
*/ */
GstVC1ParserResult GstVC1ParserResult
gst_vc1_parse_frame_header (const guint8 * data, gsize size, gst_vc1_parse_frame_header (const guint8 * data, gsize size,
@ -1885,5 +1889,6 @@ gst_vc1_bitplanes_ensure_size (GstVC1BitPlanes * bitplanes,
bitplanes->skipmb = g_malloc0 (bitplanes->size * sizeof (guint8)); bitplanes->skipmb = g_malloc0 (bitplanes->size * sizeof (guint8));
bitplanes->directmb = g_malloc0 (bitplanes->size * sizeof (guint8)); bitplanes->directmb = g_malloc0 (bitplanes->size * sizeof (guint8));
} }
return TRUE; return TRUE;
} }

View file

@ -83,8 +83,8 @@ typedef enum
typedef enum typedef enum
{ {
GST_VC1_LEVEL_LOW = 0, /* Simple/Main profile low level */ GST_VC1_LEVEL_LOW = 0, /* Simple/Main profile low level */
GST_VC1_LEVELMEDIUM = 1, /* Simple/Main profile medium level */ GST_VC1_LEVEL_MEDIUM = 1, /* Simple/Main profile medium level */
GST_VC1_LEVELHIGH = 2, /* Main profile high level */ GST_VC1_LEVEL_HIGH = 2, /* Main profile high level */
GST_VC1_LEVEL_L0 = 0, /* Advanced profile level 0 */ GST_VC1_LEVEL_L0 = 0, /* Advanced profile level 0 */
GST_VC1_LEVEL_L1 = 1, /* Advanced profile level 1 */ GST_VC1_LEVEL_L1 = 1, /* Advanced profile level 1 */