h263parse: provide for proper debug category, min frame size and code style

3 files changed, 23 insertions, 17 deletions

diff --git a/gst/h263parse/gsth263parse.c b/gst/h263parse/gsth263parse.c
index 14f5a5c98..b150751d2 100644
--- a/gst/h263parse/gsth263parse.c
+++ b/gst/h263parse/gsth263parse.c
@@ -33,6 +33,7 @@
 #include "gsth263parse.h"
 
 GST_DEBUG_CATEGORY (h263_parse_debug);
+#define GST_CAT_DEFAULT h263_parse_debug
 
 static GstStaticPadTemplate srctemplate =
 GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC,
@@ -99,7 +100,7 @@ gst_h263_parse_init (GstH263Parse * h263parse, GstH263ParseClass * g_class)
 static gboolean
 gst_h263_parse_start (GstBaseParse * parse)
 {
-  GstH263Parse *h263parse = GST_H263PARSE (parse);
+  GstH263Parse *h263parse = GST_H263_PARSE (parse);
 
   GST_DEBUG ("Start");
 
@@ -109,6 +110,7 @@ gst_h263_parse_start (GstBaseParse * parse)
 
   h263parse->state = PARSING;
 
+  gst_base_parse_set_min_frame_size (parse, 512);
   gst_base_parse_set_passthrough (parse, FALSE);
 
   return TRUE;
@@ -128,7 +130,7 @@ gst_h263_parse_sink_event (GstBaseParse * parse, GstEvent * event)
   GstH263Parse *h263parse;
   gboolean res = FALSE;
 
-  h263parse = GST_H263PARSE (parse);
+  h263parse = GST_H263_PARSE (parse);
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_TAG:
@@ -184,7 +186,10 @@ gst_h263_parse_check_valid_frame (GstBaseParse * parse, GstBuffer * buffer,
   GstH263Parse *h263parse;
   guint psc_pos, next_psc_pos;
 
-  h263parse = GST_H263PARSE (parse);
+  h263parse = GST_H263_PARSE (parse);
+
+  if (GST_BUFFER_SIZE (buffer) < 3)
+    return FALSE;
 
   psc_pos = find_psc (buffer, 0);
 
@@ -255,7 +260,7 @@ gst_h263_parse_parse_frame (GstBaseParse * parse, GstBuffer * buffer)
   GstFlowReturn res;
   H263Params *params = NULL;
 
-  h263parse = GST_H263PARSE (parse);
+  h263parse = GST_H263_PARSE (parse);
 
   res = gst_h263_parse_get_params (h263parse, buffer, &params, TRUE);
   if (res != GST_FLOW_OK)
diff --git a/gst/h263parse/gsth263parse.h b/gst/h263parse/gsth263parse.h
index ea9f9286c..c7c8fdb19 100644
--- a/gst/h263parse/gsth263parse.h
+++ b/gst/h263parse/gsth263parse.h
@@ -30,10 +30,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstadapter.h>
-#include "gstbaseparse.h"
-
-GST_DEBUG_CATEGORY_EXTERN (h263_parse_debug);
-#define GST_CAT_DEFAULT h263_parse_debug
+#include <gstbaseparse.h>
 
 G_BEGIN_DECLS
 
@@ -46,16 +43,17 @@ typedef enum
 
 typedef struct _H263Params H263Params;
 
-#define GST_TYPE_H263PARSE \
+#define GST_TYPE_H263_PARSE \
   (gst_h263_parse_get_type())
-#define GST_H263PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_H263PARSE,GstH263Parse))
-#define GST_H263PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_H263PARSE,GstH263ParseClass))
-#define GST_IS_H263PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_H263PARSE))
-#define GST_IS_H263PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_H263PARSE))
+#define GST_H263_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_H263_PARSE,GstH263Parse))
+#define GST_H263_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_H263_PARSE,GstH263ParseClass))
+#define GST_IS_H263_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_H263_PARSE))
+#define GST_IS_H263_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_H263_PARSE))
+
 GType gst_h263_parse_get_type (void);
 
 typedef struct _GstH263Parse GstH263Parse;
diff --git a/gst/h263parse/h263parse.c b/gst/h263parse/h263parse.c
index b46dcdab8..0ed681ba9 100644
--- a/gst/h263parse/h263parse.c
+++ b/gst/h263parse/h263parse.c
@@ -27,6 +27,9 @@
 #include <gst/base/gstbitreader.h>
 #include "gsth263parse.h"
 
+GST_DEBUG_CATEGORY_EXTERN (h263_parse_debug);
+#define GST_CAT_DEFAULT h263_parse_debug
+
 /* H263 Optional Features */
 typedef enum
 {