Commit e7a5ff40 authored by Stefan Kost's avatar Stefan Kost

docs: trim sections file more

Rename some defines and move some itesm to *.c files. Add more items to internal
subsection.
parent 04816de5
...@@ -333,7 +333,6 @@ GstAviPad ...@@ -333,7 +333,6 @@ GstAviPad
GstAviVideoPad GstAviVideoPad
GstAviIndexEntry GstAviIndexEntry
GstAviStream GstAviStream
GST_AVI_KEYFRAME
GST_TYPE_AVI_DEMUX GST_TYPE_AVI_DEMUX
GST_AVI_DEMUX GST_AVI_DEMUX
GST_AVI_DEMUX_CLASS GST_AVI_DEMUX_CLASS
...@@ -493,6 +492,12 @@ gst_cutter_get_type ...@@ -493,6 +492,12 @@ gst_cutter_get_type
<TITLE>deinterlace</TITLE> <TITLE>deinterlace</TITLE>
GstDeinterlace GstDeinterlace
<SUBSECTION Standard> <SUBSECTION Standard>
GST_DEINTERLACE_MAX_FIELD_HISTORY
BUILD_X86_ASM
PICTURE_PROGRESSIVE
PICTURE_INTERLACED_BOTTOM
PICTURE_INTERLACED_TOP
PICTURE_INTERLACED_MASK
GstDeinterlaceClass GstDeinterlaceClass
GST_IS_DEINTERLACE GST_IS_DEINTERLACE
GST_IS_DEINTERLACE_CLASS GST_IS_DEINTERLACE_CLASS
......
...@@ -57,6 +57,12 @@ ...@@ -57,6 +57,12 @@
#define DIV_ROUND_UP(s,v) (((s) + ((v)-1)) / (v)) #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); GST_DEBUG_CATEGORY_STATIC (avidemux_debug);
#define GST_CAT_DEFAULT avidemux_debug #define GST_CAT_DEFAULT avidemux_debug
......
...@@ -56,11 +56,6 @@ typedef struct { ...@@ -56,11 +56,6 @@ typedef struct {
guint64 total; /* total bytes before */ guint64 total; /* total bytes before */
} GstAviIndexEntry; } 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 { typedef struct {
/* index of this streamcontext */ /* index of this streamcontext */
guint num; guint num;
......
...@@ -756,7 +756,8 @@ gst_deinterlace_reset_history (GstDeinterlace * self) ...@@ -756,7 +756,8 @@ gst_deinterlace_reset_history (GstDeinterlace * self)
self->field_history[i].buf = NULL; 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; self->history_count = 0;
if (self->last_buffer) if (self->last_buffer)
...@@ -918,14 +919,15 @@ gst_deinterlace_push_history (GstDeinterlace * self, GstBuffer * buffer) ...@@ -918,14 +919,15 @@ gst_deinterlace_push_history (GstDeinterlace * self, GstBuffer * buffer)
guint fields_to_push = (onefield) ? 1 : (!repeated) ? 2 : 3; guint fields_to_push = (onefield) ? 1 : (!repeated) ? 2 : 3;
gint field1_flags, field2_flags; 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 GST_DEBUG_OBJECT (self, "Pushing new buffer to the history: %" GST_TIME_FORMAT
" with duration %" GST_TIME_FORMAT " and size %u", " with duration %" GST_TIME_FORMAT " and size %u",
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buffer)), GST_BUFFER_SIZE (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].buf = self->field_history[i - fields_to_push].buf;
self->field_history[i].flags = self->field_history[i].flags =
self->field_history[i - fields_to_push].flags; self->field_history[i - fields_to_push].flags;
......
...@@ -144,7 +144,7 @@ struct _GstDeinterlaceSimpleMethodClass { ...@@ -144,7 +144,7 @@ struct _GstDeinterlaceSimpleMethodClass {
GType gst_deinterlace_simple_method_get_type (void); 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_PROGRESSIVE 0
#define PICTURE_INTERLACED_BOTTOM 1 #define PICTURE_INTERLACED_BOTTOM 1
...@@ -155,7 +155,7 @@ typedef struct ...@@ -155,7 +155,7 @@ typedef struct
{ {
/* pointer to the start of data for this field */ /* pointer to the start of data for this field */
GstBuffer *buf; GstBuffer *buf;
/* see PICTURE_ flags */ /* see PICTURE_ flags in *.c */
guint flags; guint flags;
} GstPicture; } GstPicture;
...@@ -244,7 +244,7 @@ struct _GstDeinterlace ...@@ -244,7 +244,7 @@ struct _GstDeinterlace
Pointers are NULL if the picture in question isn't valid, e.g. because Pointers are NULL if the picture in question isn't valid, e.g. because
the program just started or a picture was skipped. 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; guint history_count;
/* Set to TRUE if we're in still frame mode, /* Set to TRUE if we're in still frame mode,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment