gst-plugins-bad: codecparsers: minor fixes

[Tim Müller]

Module: gst-plugins-bad
Branch: master
Commit: 12c678c7cf0d8cae6a9494184de527d387163022
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=12c678c7cf0d8cae6a9494184de527d387163022

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Tue Nov 29 09:15:11 2011 +0000

codecparsers: minor fixes

Const-ify one more VLC table. Fix spelling of 'hybrid'.
No need to explicitly call ensure_debug_category() everywhere,
that will be done automatically from GST_LOG() and friends
via GST_CAT_DEFAULT.

---

 gst-libs/gst/codecparsers/gstmpeg4parser.c |   10 +++-------
 gst-libs/gst/codecparsers/gstmpeg4parser.h |    2 +-
 gst-libs/gst/codecparsers/gstvc1parser.c   |   19 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/gst-libs/gst/codecparsers/gstmpeg4parser.c b/gst-libs/gst/codecparsers/gstmpeg4parser.c
index 270bd2e..f22ba91 100644
--- a/gst-libs/gst/codecparsers/gstmpeg4parser.c
+++ b/gst-libs/gst/codecparsers/gstmpeg4parser.c
@@ -121,7 +121,7 @@ static const guint8 mpeg4_zigzag_8x8[64] = {
   53, 60, 61, 54, 47, 55, 62, 63
 };
 
-static VLCTable mpeg4_dmv_size_vlc_table[] = {
+static const VLCTable mpeg4_dmv_size_vlc_table[] = {
   {0x00, 2, 0},
   {0x02, 3, 1},
   {0x03, 3, 2},
@@ -429,8 +429,6 @@ gst_mpeg4_parse (GstMpeg4Packet * packet, gboolean skip_user_data,
 
   g_return_val_if_fail (packet != NULL, GST_MPEG4_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   if (size - offset <= 4) {
     GST_DEBUG ("Can't parse, buffer is to small size %d at offset %d", size,
         offset);
@@ -512,8 +510,6 @@ gst_h263_parse (GstMpeg4Packet * packet,
 
   g_return_val_if_fail (packet != NULL, GST_MPEG4_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   if (size - offset < 3) {
     GST_DEBUG ("Can't parse, buffer is to small size %d at offset %d", size,
         offset);
@@ -656,11 +652,11 @@ gst_mpeg4_parse_visual_object_sequence (GstMpeg4VisualObjectSequence * vos,
       vos->level = GST_MPEG4_LEVEL2;
       break;
     case 0x81:
-      vos->profile = GST_MPEG4_PROFILE_HYBRYD;
+      vos->profile = GST_MPEG4_PROFILE_HYBRID;
       vos->level = GST_MPEG4_LEVEL1;
       break;
     case 0x82:
-      vos->profile = GST_MPEG4_PROFILE_HYBRYD;
+      vos->profile = GST_MPEG4_PROFILE_HYBRID;
       vos->level = GST_MPEG4_LEVEL2;
       break;
     case 0x91:
diff --git a/gst-libs/gst/codecparsers/gstmpeg4parser.h b/gst-libs/gst/codecparsers/gstmpeg4parser.h
index e739479..22f52b5 100644
--- a/gst-libs/gst/codecparsers/gstmpeg4parser.h
+++ b/gst-libs/gst/codecparsers/gstmpeg4parser.h
@@ -194,7 +194,7 @@ typedef enum {
   GST_MPEG4_PROFILE_MAIN,
   GST_MPEG4_PROFILE_N_BIT,
   GST_MPEG4_PROFILE_SIMPLE,
-  GST_MPEG4_PROFILE_HYBRYD,
+  GST_MPEG4_PROFILE_HYBRID,
   GST_MPEG4_PROFILE_RESERVED,
   GST_MPEG4_PROFILE_SIMPLE_FBA,
   GST_MPEG4_PROFILE_CORE_STUDIO,
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
index 69c34e2..8f2937f 100644
--- a/gst-libs/gst/codecparsers/gstvc1parser.c
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
@@ -1657,8 +1657,6 @@ gst_vc1_identify_next_bdu (const guint8 * data, gsize size, GstVC1BDU * bdu)
 
   g_return_val_if_fail (bdu != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   if (size < 4) {
     GST_DEBUG ("Can't parse, buffer has too small size %" G_GSSIZE_FORMAT,
         size);
@@ -1719,8 +1717,6 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
 
   g_return_val_if_fail (seqlayer != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   READ_UINT32 (&br, tmp, 8);
   if (tmp != 0xC5)
     goto failed;
@@ -1773,9 +1769,6 @@ gst_vc1_parse_sequence_header_struct_a (const guint8 * data,
 
   g_return_val_if_fail (structa != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
-
   return parse_sequence_header_struct_a (&br, structa);
 }
 
@@ -1797,8 +1790,6 @@ gst_vc1_parse_sequence_header_struct_b (const guint8 * data,
 
   g_return_val_if_fail (structb != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   return parse_sequence_header_struct_b (&br, structb);
 }
 
@@ -1820,8 +1811,6 @@ gst_vc1_parse_sequence_header_struct_c (const guint8 * data, gsize size,
 
   g_return_val_if_fail (structc != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   return parse_sequence_header_struct_c (&br, structc);
 }
 
@@ -1843,8 +1832,6 @@ gst_vc1_parse_sequence_header (const guint8 * data, gsize size,
 
   g_return_val_if_fail (seqhdr != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   if (parse_sequence_header_struct_c (&br, &seqhdr->struct_c) ==
       GST_VC1_PARSER_ERROR)
     goto failed;
@@ -1888,8 +1875,6 @@ gst_vc1_parse_entry_point_header (const guint8 * data, gsize size,
 
   g_return_val_if_fail (entrypoint != NULL, GST_VC1_PARSER_ERROR);
 
-  ensure_debug_category ();
-
   gst_bit_reader_init (&br, data, size);
 
   if (gst_bit_reader_get_remaining (&br) < 13)
@@ -2012,8 +1997,6 @@ gst_vc1_parse_frame_header (const guint8 * data, gsize size,
   GstBitReader br;
   GstVC1ParserResult result;
 
-  ensure_debug_category ();
-
   gst_bit_reader_init (&br, data, size);
 
   if (seqhdr->profile == GST_VC1_PROFILE_ADVANCED)
@@ -2046,8 +2029,6 @@ gst_vc1_parse_field_header (const guint8 * data, gsize size,
   GstBitReader br;
   GstVC1ParserResult result;
 
-  ensure_debug_category ();
-
   gst_bit_reader_init (&br, data, size);
 
   result = parse_frame_header_advanced (&br, fieldhdr, seqhdr, bitplanes, TRUE);