mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2: update for new interlaced caps

Browse source
This commit is contained in:
Wim Taymans 2011-12-19 19:03:52 +01:00
parent 8e801dfe1e
commit 4f42f58565
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/v4l2/gstv4l2bufferpool.c
View file

@ -590,10 +590,14 @@ gst_v4l2_buffer_pool_dqbuf (GstV4l2BufferPool * pool, GstBuffer ** buffer)
pool->num_queued, outbuf); pool->num_queued, outbuf);
/* set top/bottom field first if v4l2_buffer has the information */ /* set top/bottom field first if v4l2_buffer has the information */
if (vbuffer.field == V4L2_FIELD_INTERLACED_TB) if (vbuffer.field == V4L2_FIELD_INTERLACED_TB) {
GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF); GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF);
if (vbuffer.field == V4L2_FIELD_INTERLACED_BT) GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_INTERLACED);
}
if (vbuffer.field == V4L2_FIELD_INTERLACED_BT) {
GST_BUFFER_FLAG_UNSET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF); GST_BUFFER_FLAG_UNSET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF);
GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_INTERLACED);
}
/* this can change at every frame, esp. with jpeg */ /* this can change at every frame, esp. with jpeg */
if (obj->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) if (obj->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

22
sys/v4l2/gstv4l2object.c
View file

@ -1484,7 +1484,7 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
#endif #endif
if (dimensions) { if (dimensions) {
gboolean interlaced; const gchar *interlace_mode;
if (!gst_structure_get_int (structure, "width", &info->width)) if (!gst_structure_get_int (structure, "width", &info->width))
goto no_width; goto no_width;
@ -1492,11 +1492,12 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
if (!gst_structure_get_int (structure, "height", &info->height)) if (!gst_structure_get_int (structure, "height", &info->height))
goto no_height; goto no_height;
if (!gst_structure_get_boolean (structure, "interlaced", &interlaced)) interlace_mode = gst_structure_get_string (structure, "interlace-mode");
interlaced = FALSE; if (g_str_equal (interlace_mode, "progressive")) {
if (interlaced) info->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
info->flags |= GST_VIDEO_FLAG_INTERLACED; } else {
info->interlace_mode = GST_VIDEO_INTERLACE_MODE_MIXED;
}
if (!gst_structure_get_fraction (structure, "framerate", &info->fps_n, if (!gst_structure_get_fraction (structure, "framerate", &info->fps_n,
&info->fps_d)) &info->fps_d))
goto no_framerate; goto no_framerate;
@ -1731,7 +1732,7 @@ return_data:
s = gst_structure_copy (template); s = gst_structure_copy (template);
gst_structure_set (s, "width", G_TYPE_INT, (gint) width, gst_structure_set (s, "width", G_TYPE_INT, (gint) width,
"height", G_TYPE_INT, (gint) height, "height", G_TYPE_INT, (gint) height,
"interlaced", G_TYPE_BOOLEAN, interlaced, "interlace-mode", G_TYPE_STRING, (interlaced ? "mixed" : "progressive"),
"pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, NULL); "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, NULL);
if (G_IS_VALUE (&rates)) { if (G_IS_VALUE (&rates)) {
@ -1992,9 +1993,10 @@ default_frame_sizes:
else else
gst_structure_set (tmp, "height", GST_TYPE_INT_RANGE, min_h, max_h, NULL); gst_structure_set (tmp, "height", GST_TYPE_INT_RANGE, min_h, max_h, NULL);
gst_structure_set (tmp, "interlaced", G_TYPE_BOOLEAN, interlaced, NULL); gst_structure_set (tmp, "interlace-mode", G_TYPE_STRING,
gst_structure_set (tmp, "pixel-aspect-ratio", (interlaced ? "mixed" : "progressive"), NULL);
GST_TYPE_FRACTION, 1, 1, NULL); gst_structure_set (tmp, "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
NULL);
gst_caps_append_structure (ret, tmp); gst_caps_append_structure (ret, tmp);