FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

v4l2: Don't probe for unneeded format

Browse Source 
For v4l2videodec/enc, we generate elements per formats, and in
this case we can speed up the start up by only probing the format
we care about.
This commit is contained in:
Nicolas Dufresne 2017-07-14 11:54:57 -04:00
parent 724a3ceec5
commit 06424c438e
3 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/v4l2/gstv4l2object.c
View File

@ -3918,13 +3918,32 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object, GstCaps * filter)
for (walk = formats; walk; walk = walk->next) { for (walk = formats; walk; walk = walk->next) {
struct v4l2_fmtdesc *format; struct v4l2_fmtdesc *format;
GstStructure *template; GstStructure *template;
GstCaps *tmp;
format = (struct v4l2_fmtdesc *) walk->data; format = (struct v4l2_fmtdesc *) walk->data;
template = gst_v4l2_object_v4l2fourcc_to_bare_struct (format->pixelformat); template = gst_v4l2_object_v4l2fourcc_to_bare_struct (format->pixelformat);
if (template) { if (!template) {
GstCaps *tmp; GST_DEBUG_OBJECT (v4l2object->element, "unknown format %u",
format->pixelformat);
continue;
}
/* If we have a filter, check if we need to probe this format or not */
if (filter) {
GstCaps *format_caps = gst_caps_new_empty ();
gst_caps_append_structure (format_caps, gst_structure_copy (template));
if (!gst_caps_can_intersect (format_caps, filter)) {
gst_caps_unref (format_caps);
gst_structure_free (template);
continue;
}
gst_caps_unref (format_caps);
}
tmp = gst_v4l2_object_probe_caps_for_format (v4l2object, tmp = gst_v4l2_object_probe_caps_for_format (v4l2object,
format->pixelformat, template); format->pixelformat, template);
@ -3932,10 +3951,6 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object, GstCaps * filter)
gst_caps_append (ret, tmp); gst_caps_append (ret, tmp);
gst_structure_free (template); gst_structure_free (template);
} else {
GST_DEBUG_OBJECT (v4l2object->element, "unknown format %u",
format->pixelformat);
}
} }
if (filter) { if (filter) {
@ -3946,6 +3961,8 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object, GstCaps * filter)
gst_caps_unref (tmp); gst_caps_unref (tmp);
} }
GST_INFO_OBJECT (v4l2object->element, "probed caps: %" GST_PTR_FORMAT, ret);
return ret; return ret;
} }
@ -3964,8 +3981,6 @@ gst_v4l2_object_get_caps (GstV4l2Object * v4l2object, GstCaps * filter)
ret = gst_caps_ref (v4l2object->probed_caps); ret = gst_caps_ref (v4l2object->probed_caps);
} }
GST_INFO_OBJECT (v4l2object->element, "probed caps: %" GST_PTR_FORMAT, ret);
return ret; return ret;
} }

9
sys/v4l2/gstv4l2videodec.c
View File

@ -113,6 +113,7 @@ static gboolean
gst_v4l2_video_dec_open (GstVideoDecoder * decoder) gst_v4l2_video_dec_open (GstVideoDecoder * decoder)
{ {
GstV4l2VideoDec *self = GST_V4L2_VIDEO_DEC (decoder); GstV4l2VideoDec *self = GST_V4L2_VIDEO_DEC (decoder);
GstCaps *codec_caps;
GST_DEBUG_OBJECT (self, "Opening"); GST_DEBUG_OBJECT (self, "Opening");
@ -122,13 +123,15 @@ gst_v4l2_video_dec_open (GstVideoDecoder * decoder)
if (!gst_v4l2_object_open_shared (self->v4l2capture, self->v4l2output)) if (!gst_v4l2_object_open_shared (self->v4l2capture, self->v4l2output))
goto failure; goto failure;
self->probed_sinkcaps = gst_v4l2_object_get_caps (self->v4l2output, codec_caps = gst_pad_get_pad_template_caps (decoder->sinkpad);
gst_v4l2_object_get_codec_caps ()); self->probed_sinkcaps = gst_v4l2_object_probe_caps (self->v4l2output,
codec_caps);
gst_caps_unref (codec_caps);
if (gst_caps_is_empty (self->probed_sinkcaps)) if (gst_caps_is_empty (self->probed_sinkcaps))
goto no_encoded_format; goto no_encoded_format;
self->probed_srccaps = gst_v4l2_object_get_caps (self->v4l2capture, self->probed_srccaps = gst_v4l2_object_probe_caps (self->v4l2capture,
gst_v4l2_object_get_raw_caps ()); gst_v4l2_object_get_raw_caps ());
if (gst_caps_is_empty (self->probed_srccaps)) if (gst_caps_is_empty (self->probed_srccaps))

9
sys/v4l2/gstv4l2videoenc.c
View File

@ -113,6 +113,7 @@ static gboolean
gst_v4l2_video_enc_open (GstVideoEncoder * encoder) gst_v4l2_video_enc_open (GstVideoEncoder * encoder)
{ {
GstV4l2VideoEnc *self = GST_V4L2_VIDEO_ENC (encoder); GstV4l2VideoEnc *self = GST_V4L2_VIDEO_ENC (encoder);
GstCaps *codec_caps;
GST_DEBUG_OBJECT (self, "Opening"); GST_DEBUG_OBJECT (self, "Opening");
@ -122,14 +123,16 @@ gst_v4l2_video_enc_open (GstVideoEncoder * encoder)
if (!gst_v4l2_object_open_shared (self->v4l2capture, self->v4l2output)) if (!gst_v4l2_object_open_shared (self->v4l2capture, self->v4l2output))
goto failure; goto failure;
self->probed_sinkcaps = gst_v4l2_object_get_caps (self->v4l2output, self->probed_sinkcaps = gst_v4l2_object_probe_caps (self->v4l2output,
gst_v4l2_object_get_raw_caps ()); gst_v4l2_object_get_raw_caps ());
if (gst_caps_is_empty (self->probed_sinkcaps)) if (gst_caps_is_empty (self->probed_sinkcaps))
goto no_raw_format; goto no_raw_format;
self->probed_srccaps = gst_v4l2_object_get_caps (self->v4l2capture, codec_caps = gst_pad_get_pad_template_caps (encoder->srcpad);
gst_v4l2_object_get_codec_caps ()); self->probed_srccaps = gst_v4l2_object_probe_caps (self->v4l2capture,
codec_caps);
gst_caps_unref (codec_caps);
if (gst_caps_is_empty (self->probed_srccaps)) if (gst_caps_is_empty (self->probed_srccaps))
goto no_encoded_format; goto no_encoded_format;