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

mediafoundation: Fix typo in source object impl.

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1241>
This commit is contained in:
Seungha Yang 2020-05-20 22:59:19 +09:00 committed by GStreamer Merge Bot
parent bd67ef18e9
commit 6ae478946c
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/mediafoundation/gstmfcaptureengine.cpp
View file

@ -842,7 +842,7 @@ gst_mf_capture_engine_new (GstMFSourceType type, gint device_index,
g_free (name); g_free (name);
g_free (path); g_free (path);
if (!self->opend) { if (!self->opened) {
GST_WARNING_OBJECT (self, "Couldn't open device"); GST_WARNING_OBJECT (self, "Couldn't open device");
gst_object_unref (self); gst_object_unref (self);
return NULL; return NULL;

14
sys/mediafoundation/gstmfsourceobject.c
View file

@ -60,7 +60,7 @@ gst_mf_source_type_get_type (void)
struct _GstMFSourceObjectPrivate struct _GstMFSourceObjectPrivate
{ {
GstMFSourceType soure_type; GstMFSourceType source_type;
gchar *device_path; gchar *device_path;
gchar *device_name; gchar *device_name;
@ -128,7 +128,7 @@ gst_mf_source_object_init (GstMFSourceObject * self)
self->priv = priv = gst_mf_source_object_get_instance_private (self); self->priv = priv = gst_mf_source_object_get_instance_private (self);
priv->device_index = DEFAULT_DEVICE_INDEX; priv->device_index = DEFAULT_DEVICE_INDEX;
priv->soure_type = DEFAULT_SOURCE_TYPE; priv->source_type = DEFAULT_SOURCE_TYPE;
g_mutex_init (&priv->lock); g_mutex_init (&priv->lock);
g_cond_init (&priv->cond); g_cond_init (&priv->cond);
@ -143,7 +143,7 @@ gst_mf_source_object_constructed (GObject * object)
GstMFSourceObject *self = GST_MF_SOURCE_OBJECT (object); GstMFSourceObject *self = GST_MF_SOURCE_OBJECT (object);
GstMFSourceObjectPrivate *priv = self->priv; GstMFSourceObjectPrivate *priv = self->priv;
/* Create thread so that ensure COM thread can be MTA thread */ /* Create a new thread to ensure that COM thread can be MTA thread */
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
priv->thread = g_thread_new ("GstMFSourceObject", priv->thread = g_thread_new ("GstMFSourceObject",
(GThreadFunc) gst_mf_source_object_thread_func, self); (GThreadFunc) gst_mf_source_object_thread_func, self);
@ -204,7 +204,7 @@ gst_mf_source_object_get_property (GObject * object, guint prop_id,
g_value_set_int (value, priv->device_index); g_value_set_int (value, priv->device_index);
break; break;
case PROP_SOURCE_TYPE: case PROP_SOURCE_TYPE:
g_value_set_enum (value, priv->soure_type); g_value_set_enum (value, priv->source_type);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -232,7 +232,7 @@ gst_mf_source_object_set_property (GObject * object, guint prop_id,
priv->device_index = g_value_get_int (value); priv->device_index = g_value_get_int (value);
break; break;
case PROP_SOURCE_TYPE: case PROP_SOURCE_TYPE:
priv->soure_type = g_value_get_enum (value); priv->source_type = g_value_get_enum (value);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -278,7 +278,7 @@ gst_mf_source_object_thread_func (GstMFSourceObject * self)
g_source_unref (source); g_source_unref (source);
if (!gst_mf_source_enum_device_activate (self, if (!gst_mf_source_enum_device_activate (self,
priv->soure_type, &activate_list)) { priv->source_type, &activate_list)) {
GST_WARNING_OBJECT (self, "No available video capture device"); GST_WARNING_OBJECT (self, "No available video capture device");
goto run_loop; goto run_loop;
} }
@ -314,7 +314,7 @@ gst_mf_source_object_thread_func (GstMFSourceObject * self)
} }
if (target) { if (target) {
self->opend = klass->open (self, target->handle); self->opened = klass->open (self, target->handle);
g_free (priv->device_path); g_free (priv->device_path);
priv->device_path = g_strdup (target->path); priv->device_path = g_strdup (target->path);

2
sys/mediafoundation/gstmfsourceobject.h
View file

@ -57,7 +57,7 @@ struct _GstMFSourceObject
{ {
GstObject parent; GstObject parent;
gboolean opend; gboolean opened;
GstMFSourceObjectPrivate *priv; GstMFSourceObjectPrivate *priv;
}; };

2
sys/mediafoundation/gstmfsourcereader.cpp
View file

@ -507,7 +507,7 @@ gst_mf_source_reader_new (GstMFSourceType type, gint device_index,
g_free (name); g_free (name);
g_free (path); g_free (path);
if (!self->opend) { if (!self->opened) {
GST_WARNING_OBJECT (self, "Couldn't open device"); GST_WARNING_OBJECT (self, "Couldn't open device");
gst_object_unref (self); gst_object_unref (self);
return NULL; return NULL;