summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2010-04-08 12:14:07 +0300
committerStefan Kost <ensonic@users.sf.net>2010-04-08 12:14:07 +0300
commite7a5ff40bd05321f6f06ac7c05e2f00c5688fe40 (patch)
tree9433ee951008cb10b7c85a2043d377a4cf4f7ba1
parent04816de5e60b088cafc11cbe844abf9f6d28fe0f (diff)
docs: trim sections file more
Rename some defines and move some itesm to *.c files. Add more items to internal subsection.
-rw-r--r--docs/plugins/gst-plugins-good-plugins-sections.txt7
-rw-r--r--gst/avi/gstavidemux.c6
-rw-r--r--gst/avi/gstavidemux.h5
-rw-r--r--gst/deinterlace/gstdeinterlace.c8
-rw-r--r--gst/deinterlace/gstdeinterlace.h6
5 files changed, 20 insertions, 12 deletions
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 87621f412..3715f8904 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -333,7 +333,6 @@ GstAviPad
GstAviVideoPad
GstAviIndexEntry
GstAviStream
-GST_AVI_KEYFRAME
GST_TYPE_AVI_DEMUX
GST_AVI_DEMUX
GST_AVI_DEMUX_CLASS
@@ -493,6 +492,12 @@ gst_cutter_get_type
<TITLE>deinterlace</TITLE>
GstDeinterlace
<SUBSECTION Standard>
+GST_DEINTERLACE_MAX_FIELD_HISTORY
+BUILD_X86_ASM
+PICTURE_PROGRESSIVE
+PICTURE_INTERLACED_BOTTOM
+PICTURE_INTERLACED_TOP
+PICTURE_INTERLACED_MASK
GstDeinterlaceClass
GST_IS_DEINTERLACE
GST_IS_DEINTERLACE_CLASS
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 2670fee2f..0735e83ea 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -57,6 +57,12 @@
#define DIV_ROUND_UP(s,v) (((s) + ((v)-1)) / (v))
+#define GST_AVI_KEYFRAME 1
+#define ENTRY_IS_KEYFRAME(e) ((e)->flags == GST_AVI_KEYFRAME)
+#define ENTRY_SET_KEYFRAME(e) ((e)->flags = GST_AVI_KEYFRAME)
+#define ENTRY_UNSET_KEYFRAME(e) ((e)->flags = 0)
+
+
GST_DEBUG_CATEGORY_STATIC (avidemux_debug);
#define GST_CAT_DEFAULT avidemux_debug
diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h
index 8216d9fd3..c1cd21669 100644
--- a/gst/avi/gstavidemux.h
+++ b/gst/avi/gstavidemux.h
@@ -56,11 +56,6 @@ typedef struct {
guint64 total; /* total bytes before */
} GstAviIndexEntry;
-#define GST_AVI_KEYFRAME 1
-#define ENTRY_IS_KEYFRAME(e) ((e)->flags == GST_AVI_KEYFRAME)
-#define ENTRY_SET_KEYFRAME(e) ((e)->flags = GST_AVI_KEYFRAME)
-#define ENTRY_UNSET_KEYFRAME(e) ((e)->flags = 0)
-
typedef struct {
/* index of this streamcontext */
guint num;
diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c
index 1ee73a35f..8a6d17e56 100644
--- a/gst/deinterlace/gstdeinterlace.c
+++ b/gst/deinterlace/gstdeinterlace.c
@@ -756,7 +756,8 @@ gst_deinterlace_reset_history (GstDeinterlace * self)
self->field_history[i].buf = NULL;
}
}
- memset (self->field_history, 0, MAX_FIELD_HISTORY * sizeof (GstPicture));
+ memset (self->field_history, 0,
+ GST_DEINTERLACE_MAX_FIELD_HISTORY * sizeof (GstPicture));
self->history_count = 0;
if (self->last_buffer)
@@ -918,14 +919,15 @@ gst_deinterlace_push_history (GstDeinterlace * self, GstBuffer * buffer)
guint fields_to_push = (onefield) ? 1 : (!repeated) ? 2 : 3;
gint field1_flags, field2_flags;
- g_return_if_fail (self->history_count < MAX_FIELD_HISTORY - fields_to_push);
+ g_return_if_fail (self->history_count <
+ GST_DEINTERLACE_MAX_FIELD_HISTORY - fields_to_push);
GST_DEBUG_OBJECT (self, "Pushing new buffer to the history: %" GST_TIME_FORMAT
" with duration %" GST_TIME_FORMAT " and size %u",
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buffer)), GST_BUFFER_SIZE (buffer));
- for (i = MAX_FIELD_HISTORY - 1; i >= fields_to_push; i--) {
+ for (i = GST_DEINTERLACE_MAX_FIELD_HISTORY - 1; i >= fields_to_push; i--) {
self->field_history[i].buf = self->field_history[i - fields_to_push].buf;
self->field_history[i].flags =
self->field_history[i - fields_to_push].flags;
diff --git a/gst/deinterlace/gstdeinterlace.h b/gst/deinterlace/gstdeinterlace.h
index 806665b8c..cc60b307b 100644
--- a/gst/deinterlace/gstdeinterlace.h
+++ b/gst/deinterlace/gstdeinterlace.h
@@ -144,7 +144,7 @@ struct _GstDeinterlaceSimpleMethodClass {
GType gst_deinterlace_simple_method_get_type (void);
-#define MAX_FIELD_HISTORY 10
+#define GST_DEINTERLACE_MAX_FIELD_HISTORY 10
#define PICTURE_PROGRESSIVE 0
#define PICTURE_INTERLACED_BOTTOM 1
@@ -155,7 +155,7 @@ typedef struct
{
/* pointer to the start of data for this field */
GstBuffer *buf;
- /* see PICTURE_ flags */
+ /* see PICTURE_ flags in *.c */
guint flags;
} GstPicture;
@@ -244,7 +244,7 @@ struct _GstDeinterlace
Pointers are NULL if the picture in question isn't valid, e.g. because
the program just started or a picture was skipped.
*/
- GstPicture field_history[MAX_FIELD_HISTORY];
+ GstPicture field_history[GST_DEINTERLACE_MAX_FIELD_HISTORY];
guint history_count;
/* Set to TRUE if we're in still frame mode,