mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

deinterlace2: Add initial support for automatic detection of the field order

Browse source
This commit is contained in:
Sebastian Dröge 2009-04-15 15:33:17 +02:00
parent 5a95bac390
commit b66a6f90be
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/deinterlace2/gstdeinterlace2.c
View file

@ -692,6 +692,7 @@ gst_deinterlace2_push_history (GstDeinterlace2 * self, GstBuffer * buffer)
{ {
int i = 1; int i = 1;
GstClockTime timestamp; GstClockTime timestamp;
GstDeinterlace2FieldLayout field_layout = self->field_layout;
g_assert (self->history_count < MAX_FIELD_HISTORY - 2); g_assert (self->history_count < MAX_FIELD_HISTORY - 2);
@ -700,13 +701,16 @@ gst_deinterlace2_push_history (GstDeinterlace2 * self, GstBuffer * buffer)
self->field_history[i].flags = self->field_history[i - 2].flags; self->field_history[i].flags = self->field_history[i - 2].flags;
} }
if (self->field_layout == GST_DEINTERLACE2_LAYOUT_AUTO) { if (field_layout == GST_DEINTERLACE2_LAYOUT_AUTO) {
GST_WARNING ("Could not detect field layout. Assuming top field first."); if (!self->interlaced
self->field_layout = GST_DEINTERLACE2_LAYOUT_TFF; || GST_BUFFER_FLAG_IS_SET (buffer, GST_VIDEO_BUFFER_TFF))
field_layout = GST_DEINTERLACE2_LAYOUT_TFF;
else
field_layout = GST_DEINTERLACE2_LAYOUT_BFF;
} }
if (self->field_layout == GST_DEINTERLACE2_LAYOUT_TFF) { if (field_layout == GST_DEINTERLACE2_LAYOUT_TFF) {
GST_DEBUG ("Top field first"); GST_DEBUG ("Top field first");
self->field_history[0].buf = self->field_history[0].buf =
gst_buffer_create_sub (buffer, self->line_length, gst_buffer_create_sub (buffer, self->line_length,
@ -1077,10 +1081,11 @@ gst_deinterlace2_setcaps (GstPad * pad, GstCaps * caps)
gst_structure_get_fraction (structure, "framerate", &self->frame_rate_n, gst_structure_get_fraction (structure, "framerate", &self->frame_rate_n,
&self->frame_rate_d); &self->frame_rate_d);
res &= gst_structure_get_fourcc (structure, "format", &fourcc); res &= gst_structure_get_fourcc (structure, "format", &fourcc);
/* TODO: get interlaced, field_layout, field_order */ res &= gst_video_format_parse_caps_interlaced (caps, &self->interlaced);
if (!res) if (!res)
goto invalid_caps; goto invalid_caps;
/* FIXME: Only do this when self->interlaced == TRUE ? */
if (self->fields == GST_DEINTERLACE2_ALL) { if (self->fields == GST_DEINTERLACE2_ALL) {
gint fps_n = self->frame_rate_n, fps_d = self->frame_rate_d; gint fps_n = self->frame_rate_n, fps_d = self->frame_rate_d;

1
gst/deinterlace2/gstdeinterlace2.h
View file

@ -199,6 +199,7 @@ struct _GstDeinterlace2
guint frame_size; guint frame_size;
gint frame_rate_n, frame_rate_d; gint frame_rate_n, frame_rate_d;
gboolean interlaced;
/* Duration of one field */ /* Duration of one field */
GstClockTime field_duration; GstClockTime field_duration;