*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <gst/gst_private.h>
#include <gst/gstconfig.h>
#include <gst/gstelement.h>
+#include <gst/gsttracerfactory.h>
#include <gst/gsttypefind.h>
#include <gst/gsttypefindfactory.h>
+#include <gst/gstdeviceproviderfactory.h>
+#include <gst/gstdynamictypefactory.h>
#include <gst/gsturi.h>
#include <gst/gstinfo.h>
#include <gst/gstenumtypes.h>
#define unpack_element(inptr, outptr, element, endptr, error_label) G_STMT_START{ \
if (inptr + sizeof(element) > endptr) { \
GST_ERROR ("Failed reading element " G_STRINGIFY (element) \
- ". Have %d bytes need %" G_GSSIZE_FORMAT, \
+ ". Have %d bytes need %" G_GSIZE_FORMAT, \
(int) (endptr - inptr), sizeof(element)); \
goto error_label; \
} \
return TRUE;
}
-#define VALIDATE_UTF8(__details, __entry) \
-G_STMT_START { \
- if (!g_utf8_validate (__details->__entry, -1, NULL)) { \
- g_warning ("Invalid UTF-8 in " G_STRINGIFY (__entry) ": %s", \
- __details->__entry); \
- g_free (__details->__entry); \
- __details->__entry = g_strdup ("[ERROR: invalid UTF-8]"); \
- } \
-} G_STMT_END
-
/*
* gst_registry_chunks_save_feature:
*
static gboolean
gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
{
- const gchar *type_name = g_type_name (G_OBJECT_TYPE (feature));
+ const gchar *type_name = G_OBJECT_TYPE_NAME (feature);
GstRegistryChunkPluginFeature *pf = NULL;
GstRegistryChunk *chk = NULL;
GList *walk;
+ gsize pf_size = 0;
if (!type_name) {
GST_ERROR ("NULL feature type_name, aborting.");
GstElementFactory *factory = GST_ELEMENT_FACTORY (feature);
/* Initialize with zeroes because of struct padding and
- * valgrind complaining about copying unitialized memory
+ * valgrind complaining about copying uninitialized memory
*/
ef = g_slice_new0 (GstRegistryChunkElementFactory);
- chk =
- gst_registry_chunks_make_data (ef,
- sizeof (GstRegistryChunkElementFactory));
+ pf_size = sizeof (GstRegistryChunkElementFactory);
+ chk = gst_registry_chunks_make_data (ef, pf_size);
ef->npadtemplates = ef->ninterfaces = ef->nuriprotocols = 0;
pf = (GstRegistryChunkPluginFeature *) ef;
walk = g_list_next (walk), ef->ninterfaces++) {
gst_registry_chunks_save_const_string (list, (gchar *) walk->data);
}
- GST_DEBUG ("Feature %s: saved %d interfaces %d pad templates",
- GST_OBJECT_NAME (feature), ef->ninterfaces, ef->npadtemplates);
+ GST_DEBUG_OBJECT (feature, "saved %d interfaces %d pad templates",
+ ef->ninterfaces, ef->npadtemplates);
/* save uritypes */
if (GST_URI_TYPE_IS_VALID (factory->uri_type)) {
ef->nuriprotocols++;
}
*list = g_list_prepend (*list, subchk);
- GST_DEBUG ("Saved %d UriTypes", ef->nuriprotocols);
+ GST_DEBUG_OBJECT (feature, "Saved %d UriTypes", ef->nuriprotocols);
} else {
g_warning ("GStreamer feature '%s' is URI handler but does not provide"
" any protocols it can handle", GST_OBJECT_NAME (feature));
GstStaticPadTemplate *template = walk->data;
if (!gst_registry_chunks_save_pad_template (list, template)) {
- GST_ERROR ("Can't fill pad template, aborting.");
+ GST_ERROR_OBJECT (feature, "Can't fill pad template, aborting.");
goto fail;
}
}
gchar *str;
/* Initialize with zeroes because of struct padding and
- * valgrind complaining about copying unitialized memory
+ * valgrind complaining about copying uninitialized memory
*/
tff = g_slice_new0 (GstRegistryChunkTypeFindFactory);
- chk =
- gst_registry_chunks_make_data (tff,
- sizeof (GstRegistryChunkTypeFindFactory));
+ pf_size = sizeof (GstRegistryChunkTypeFindFactory);
+ chk = gst_registry_chunks_make_data (tff, pf_size);
tff->nextensions = 0;
pf = (GstRegistryChunkPluginFeature *) tff;
factory->extensions[tff->nextensions++]);
}
}
+ GST_DEBUG_OBJECT (feature, "saved %d extensions", tff->nextensions);
/* save caps */
if (factory->caps) {
- /* we copy the caps here so we can simplify them before saving. This
- * is a lot faster when loading them later on */
- GstCaps *copy = gst_caps_copy (factory->caps);
+ GstCaps *fcaps = gst_caps_ref (factory->caps);
+ /* we simplify the caps before saving. This is a lot faster
+ * when loading them later on */
+ fcaps = gst_caps_simplify (fcaps);
+ str = gst_caps_to_string (fcaps);
+ gst_caps_unref (fcaps);
- gst_caps_do_simplify (copy);
- str = gst_caps_to_string (copy);
- gst_caps_unref (copy);
gst_registry_chunks_save_string (list, str);
} else {
gst_registry_chunks_save_const_string (list, "");
}
- } else if (GST_IS_INDEX_FACTORY (feature)) {
- GstIndexFactory *factory = GST_INDEX_FACTORY (feature);
+ } else if (GST_IS_DEVICE_PROVIDER_FACTORY (feature)) {
+ GstRegistryChunkDeviceProviderFactory *tff;
+ GstDeviceProviderFactory *factory = GST_DEVICE_PROVIDER_FACTORY (feature);
- pf = g_slice_new (GstRegistryChunkPluginFeature);
+ /* Initialize with zeroes because of struct padding and
+ * valgrind complaining about copying uninitialized memory
+ */
+ tff = g_slice_new0 (GstRegistryChunkDeviceProviderFactory);
chk =
- gst_registry_chunks_make_data (pf,
- sizeof (GstRegistryChunkPluginFeature));
+ gst_registry_chunks_make_data (tff,
+ sizeof (GstRegistryChunkDeviceProviderFactory));
+ pf = (GstRegistryChunkPluginFeature *) tff;
- /* pack element factory strings */
- gst_registry_chunks_save_const_string (list, factory->longdesc);
+
+ /* pack element metadata strings */
+ gst_registry_chunks_save_string (list,
+ gst_structure_to_string (factory->metadata));
+ } else if (GST_IS_TRACER_FACTORY (feature)) {
+ /* Initialize with zeroes because of struct padding and
+ * valgrind complaining about copying uninitialized memory
+ */
+ pf = g_slice_new0 (GstRegistryChunkPluginFeature);
+ pf_size = sizeof (GstRegistryChunkPluginFeature);
+ chk = gst_registry_chunks_make_data (pf, pf_size);
+ } else if (GST_IS_DYNAMIC_TYPE_FACTORY (feature)) {
+ GstRegistryChunkDynamicTypeFactory *tmp;
+
+ tmp = g_slice_new0 (GstRegistryChunkDynamicTypeFactory);
+ chk =
+ gst_registry_chunks_make_data (tmp,
+ sizeof (GstRegistryChunkDynamicTypeFactory));
+ pf = (GstRegistryChunkPluginFeature *) tmp;
} else {
- GST_WARNING ("unhandled feature type '%s'", type_name);
+ GST_WARNING_OBJECT (feature, "unhandled feature type '%s'", type_name);
}
if (pf) {
/* Errors */
fail:
- g_free (chk);
- g_free (pf);
+ g_slice_free (GstRegistryChunk, chk);
+ g_slice_free1 (pf_size, pf);
return FALSE;
}
/* Errors */
fail:
gst_plugin_feature_list_free (plugin_features);
- g_free (chk);
- g_free (pe);
+ g_slice_free (GstRegistryChunk, chk);
+ g_slice_free (GstRegistryChunkPluginElement, pe);
return FALSE;
}
template = g_slice_new (GstStaticPadTemplate);
template->presence = pt->presence;
template->direction = (GstPadDirection) pt->direction;
- template->static_caps.caps.mini_object.refcount = 0;
+ template->static_caps.caps = NULL;
/* unpack pad template strings */
unpack_const_string (*in, template->name_template, end, fail);
plugin_name);
return FALSE;
}
- if (G_UNLIKELY ((feature = g_object_newv (type, 0, NULL)) == NULL)) {
+ if (G_UNLIKELY ((feature = g_object_new (type, NULL)) == NULL)) {
GST_ERROR ("Can't create feature from type");
return FALSE;
}
factory->extensions[i - 1] = str;
}
}
- } else if (GST_IS_INDEX_FACTORY (feature)) {
- GstIndexFactory *factory = GST_INDEX_FACTORY (feature);
+ } else if (GST_IS_DEVICE_PROVIDER_FACTORY (feature)) {
+ GstRegistryChunkDeviceProviderFactory *dmf;
+ GstDeviceProviderFactory *factory = GST_DEVICE_PROVIDER_FACTORY (feature);
+ const gchar *meta_data_str;
align (*in);
GST_DEBUG
("Reading/casting for GstRegistryChunkPluginFeature at address %p",
*in);
+
+ unpack_element (*in, dmf, GstRegistryChunkDeviceProviderFactory, end, fail);
+
+ pf = (GstRegistryChunkPluginFeature *) dmf;
+
+ /* unpack element factory strings */
+ unpack_string_nocopy (*in, meta_data_str, end, fail);
+ if (meta_data_str && *meta_data_str) {
+ factory->metadata = gst_structure_from_string (meta_data_str, NULL);
+ if (!factory->metadata) {
+ GST_ERROR
+ ("Error when trying to deserialize structure for metadata '%s'",
+ meta_data_str);
+ goto fail;
+ }
+ }
+ } else if (GST_IS_TRACER_FACTORY (feature)) {
+ align (*in);
+ GST_DEBUG
+ ("Reading/casting for GstRegistryChunkPluginFeature at address %p",
+ *in);
unpack_element (*in, pf, GstRegistryChunkPluginFeature, end, fail);
+ } else if (GST_IS_DYNAMIC_TYPE_FACTORY (feature)) {
+ GstRegistryChunkDynamicTypeFactory *tmp;
+
+ align (*in);
+ unpack_element (*in, tmp, GstRegistryChunkDynamicTypeFactory, end, fail);
- /* unpack index factory strings */
- unpack_string (*in, factory->longdesc, end, fail);
+ pf = (GstRegistryChunkPluginFeature *) tmp;
} else {
GST_WARNING ("unhandled factory type : %s", G_OBJECT_TYPE_NAME (feature));
goto fail;
return arr;
fail:
GST_INFO ("Reading plugin dependency strings failed");
+ g_strfreev (arr);
return NULL;
}
*in);
unpack_element (*in, pe, GstRegistryChunkPluginElement, end, fail);
- plugin = g_object_newv (GST_TYPE_PLUGIN, 0, NULL);
+ plugin = g_object_new (GST_TYPE_PLUGIN, NULL);
/* TODO: also set GST_PLUGIN_FLAG_CONST */
- plugin->flags |= GST_PLUGIN_FLAG_CACHED;
+ GST_OBJECT_FLAG_SET (plugin, GST_PLUGIN_FLAG_CACHED);
plugin->file_mtime = pe->file_mtime;
plugin->file_size = pe->file_size;
/* If the license string is 'BLACKLIST', mark this as a blacklisted
* plugin */
if (strcmp (plugin->desc.license, "BLACKLIST") == 0)
- plugin->flags |= GST_PLUGIN_FLAG_BLACKLISTED;
+ GST_OBJECT_FLAG_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED);
plugin->basename = g_path_get_basename (plugin->filename);
projects / platform / upstream / gstreamer.git / blobdiff