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

dshowvideosrc: delay selecting device until source is started

Browse source 
The previous behaviour had issues when setting one of the device properties
after _get_caps had been called. The device shouldn't be locked in until after
_start has been called.
This commit is contained in:
Joshua M. Doe 2018-10-12 08:57:07 -04:00 committed by Nirbheek Chauhan
parent 4b4535b35c
commit 73a84148d3
1 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
sys/dshowsrcwrapper/gstdshowvideosrc.cpp
View file

@ -89,6 +89,8 @@ static GstCaps *gst_dshowvideosrc_src_fixate (GstBaseSrc * bsrc, GstCaps * caps)
static GstFlowReturn gst_dshowvideosrc_create (GstPushSrc * psrc, static GstFlowReturn gst_dshowvideosrc_create (GstPushSrc * psrc,
GstBuffer ** buf); GstBuffer ** buf);
static gboolean gst_dshowvideosrc_create_capture_filter(GstDshowVideoSrc * src);
/*utils*/ /*utils*/
static GstCaps *gst_dshowvideosrc_getcaps_from_streamcaps (GstDshowVideoSrc * static GstCaps *gst_dshowvideosrc_getcaps_from_streamcaps (GstDshowVideoSrc *
src, IPin * pin); src, IPin * pin);
@ -318,18 +320,41 @@ gst_dshowvideosrc_get_property (GObject * object, guint prop_id,
static GstCaps * static GstCaps *
gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter) gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter)
{
GstDshowVideoSrc *src = GST_DSHOWVIDEOSRC (basesrc);
GstCaps *caps;
if (src->caps) {
caps = gst_caps_ref (src->caps);
} else {
caps = gst_pad_get_pad_template_caps (GST_BASE_SRC_PAD (src));
}
if (caps) {
GstCaps *filtcaps;
if (filter) {
filtcaps = gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
} else {
filtcaps = gst_caps_ref (caps);
}
gst_caps_unref (caps);
return filtcaps;
}
return NULL;
}
static gboolean
gst_dshowvideosrc_create_capture_filter(GstDshowVideoSrc * src)
{ {
HRESULT hres = S_OK; HRESULT hres = S_OK;
IBindCtx *lpbc = NULL; IBindCtx *lpbc = NULL;
IMoniker *videom; IMoniker *videom;
DWORD dwEaten; DWORD dwEaten;
GstDshowVideoSrc *src = GST_DSHOWVIDEOSRC (basesrc);
gunichar2 *unidevice = NULL; gunichar2 *unidevice = NULL;
if (src->caps) {
return gst_caps_ref (src->caps);
}
/* device will be used first, then device-name, then device-index */ /* device will be used first, then device-name, then device-index */
if (!src->device) { if (!src->device) {
GST_DEBUG_OBJECT (src, "No device set, will enumerate to match device-name or device-index"); GST_DEBUG_OBJECT (src, "No device set, will enumerate to match device-name or device-index");
@ -339,7 +364,7 @@ gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter)
&src->device_name, &src->device_index); &src->device_name, &src->device_index);
if (!src->device) { if (!src->device) {
GST_ERROR ("No video device found."); GST_ERROR ("No video device found.");
return NULL; return FALSE;
} }
} }
@ -363,6 +388,8 @@ gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter)
} }
} }
g_free (unidevice);
if (!src->caps) { if (!src->caps) {
src->caps = gst_caps_new_empty (); src->caps = gst_caps_new_empty ();
} }
@ -415,21 +442,7 @@ gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter)
} }
} }
g_free (unidevice); return TRUE;
if (src->caps) {
GstCaps *caps;
if (filter) {
caps = gst_caps_intersect_full (filter, src->caps, GST_CAPS_INTERSECT_FIRST);
} else {
caps = gst_caps_ref (src->caps);
}
return caps;
}
return NULL;
} }
static GstStateChangeReturn static GstStateChangeReturn
@ -480,6 +493,8 @@ gst_dshowvideosrc_start (GstBaseSrc * bsrc)
HRESULT hres = S_FALSE; HRESULT hres = S_FALSE;
GstDshowVideoSrc *src = GST_DSHOWVIDEOSRC (bsrc); GstDshowVideoSrc *src = GST_DSHOWVIDEOSRC (bsrc);
gst_dshowvideosrc_create_capture_filter (src);
/* /*
The filter graph now is created via the IGraphBuilder Interface The filter graph now is created via the IGraphBuilder Interface
Code added to build upstream filters, needed for USB Analog TV Tuners / DVD Maker, based on AMCap code. Code added to build upstream filters, needed for USB Analog TV Tuners / DVD Maker, based on AMCap code.