From: <sl...@ke...> - 2008-01-31 10:16:56
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Thu Jan 31 2008 10:17:00 UTC Log message: * ext/metadata/Makefile.am: Add some relevant variables to CFLAGS and LIBADD, for example our compiler warnings paramters. * ext/metadata/gstbasemetadata.c: (gst_base_metadata_strip_push_buffer), (gst_base_metadata_calculate_offsets), (gst_base_metadata_src_event), (gst_base_metadata_sink_activate): * ext/metadata/gstmetadatademux.c: (gst_metadata_demux_init), (gst_metadata_demux_set_property), (gst_metadata_demux_dispose): * ext/metadata/gstmetadatamux.c: (gst_metadata_mux_init), (gst_metadata_mux_set_property), (gst_metadata_mux_get_property), (gst_metadata_mux_dispose), (gst_metadata_mux_create_chunks_from_tags): * ext/metadata/metadata.c: (metadata_dispose): * ext/metadata/metadataexif.c: (metadataparse_exif_content_foreach_entry_func), (metadatamux_exif_for_each_tag_in_list): * ext/metadata/metadataiptc.c: (metadatamux_iptc_for_each_tag_in_list): * ext/metadata/metadatamuxjpeg.c: (metadatamux_jpeg_lazy_update), (metadatamux_jpeg_reading): * ext/metadata/metadatamuxpng.c: (metadatamux_png_reading): * ext/metadata/metadataparsejpeg.c: (metadataparse_jpeg_reading): * ext/metadata/metadataparsepng.c: * ext/metadata/metadataparseutil.h: * ext/metadata/metadataxmp.c: (metadataparse_xmp_tag_list_add), (metadatamux_xmp_create_chunk_from_tag_list): Fix a million warnings that showed up after the above change. Modified files: . : ChangeLog ext/metadata : Makefile.am gstbasemetadata.c gstmetadatademux.c gstmetadatamux.c metadata.c metadataexif.c metadataiptc.c metadatamuxjpeg.c metadatamuxpng.c metadataparsejpeg.c metadataparsepng.c metadataparseutil.h metadataxmp.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3090&r2=1.3091 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/Makefile.am.diff?r1=1.10&r2=1.11 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/gstbasemetadata.c.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/gstmetadatademux.c.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/gstmetadatamux.c.diff?r1=1.12&r2=1.13 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadata.c.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataexif.c.diff?r1=1.10&r2=1.11 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataiptc.c.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadatamuxjpeg.c.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadatamuxpng.c.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataparsejpeg.c.diff?r1=1.15&r2=1.16 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataparsepng.c.diff?r1=1.10&r2=1.11 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataparseutil.h.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataxmp.c.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3090 retrieving revision 1.3091 diff -u -d -r1.3090 -r1.3091 --- ChangeLog 31 Jan 2008 09:50:30 -0000 1.3090 +++ ChangeLog 31 Jan 2008 10:16:43 -0000 1.3091 @@ -1,5 +1,37 @@ 2008-01-31 Sebastian Dröge <sl...@ci...> + * ext/metadata/Makefile.am: + Add some relevant variables to CFLAGS and LIBADD, for example our + compiler warnings paramters. + + * ext/metadata/gstbasemetadata.c: + (gst_base_metadata_strip_push_buffer), + (gst_base_metadata_calculate_offsets), + (gst_base_metadata_src_event), (gst_base_metadata_sink_activate): + * ext/metadata/gstmetadatademux.c: (gst_metadata_demux_init), + (gst_metadata_demux_set_property), (gst_metadata_demux_dispose): + * ext/metadata/gstmetadatamux.c: (gst_metadata_mux_init), + (gst_metadata_mux_set_property), (gst_metadata_mux_get_property), + (gst_metadata_mux_dispose), + (gst_metadata_mux_create_chunks_from_tags): + * ext/metadata/metadata.c: (metadata_dispose): + * ext/metadata/metadataexif.c: + (metadataparse_exif_content_foreach_entry_func), + (metadatamux_exif_for_each_tag_in_list): + * ext/metadata/metadataiptc.c: + (metadatamux_iptc_for_each_tag_in_list): + * ext/metadata/metadatamuxjpeg.c: (metadatamux_jpeg_lazy_update), + (metadatamux_jpeg_reading): + * ext/metadata/metadatamuxpng.c: (metadatamux_png_reading): + * ext/metadata/metadataparsejpeg.c: (metadataparse_jpeg_reading): + * ext/metadata/metadataparsepng.c: + * ext/metadata/metadataparseutil.h: + * ext/metadata/metadataxmp.c: (metadataparse_xmp_tag_list_add), + (metadatamux_xmp_create_chunk_from_tag_list): + Fix a million warnings that showed up after the above change. +2008-01-31 Sebastian Dröge <sl...@ci...> * ext/soup/gstsouphttpsrc.c: (_do_init), (gst_soup_http_src_base_init), (gst_soup_http_src_class_init), (gst_soup_http_src_init), (gst_soup_http_src_dispose), Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 21 Dec 2007 09:45:55 -0000 1.10 +++ Makefile.am 31 Jan 2008 10:16:45 -0000 1.11 @@ -19,8 +19,8 @@ libgstmetadata_ladir = $(includedir)/gstreamer-@GST_MAJORMINOR@/metadata libgstmetadata_la_HEADERS = metadatatags.h -libgstmetadata_la_CFLAGS = $(METADATA_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) -libgstmetadata_la_LIBADD = $(METADATA_LIBS) -lgsttag-@GST_MAJORMINOR@ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) +libgstmetadata_la_CFLAGS = $(METADATA_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstmetadata_la_LIBADD = $(METADATA_LIBS) -lgsttag-@GST_MAJORMINOR@ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) libgstmetadata_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmetadatademux.h \ Index: gstbasemetadata.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/gstbasemetadata.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gstbasemetadata.c 30 Jan 2008 16:05:23 -0000 1.7 +++ gstbasemetadata.c 31 Jan 2008 10:16:45 -0000 1.8 @@ -692,8 +692,6 @@ if (inject_len) { for (i = 0; i < inject_len; ++i) { - int res; - if (inject[i].offset_orig >= offset_orig) { if (G_LIKELY (inject_begin || inject[i].offset_orig > offset_orig)) { if (inject[i].offset_orig < offset_orig + size_buf_in) { @@ -838,8 +836,6 @@ striped_so_far = 0; j = 0; while (j < strip_len) { if (strip[j].offset_orig < inject[i].offset_orig) striped_so_far += bsize_strip[j++]; @@ -873,9 +869,6 @@ } -done: if (prepend_size) { if (injected_bytes == 0 && striped_bytes == 0) { GstBuffer *new_buf = @@ -1141,7 +1134,6 @@ gst_base_metadata_calculate_offsets (GstBaseMetadata * base) { int i, j; - guint32 append_size; guint32 bytes_striped, bytes_inject; MetadataChunk *strip = META_DATA_STRIP_CHUNKS (base->metadata).chunk; MetadataChunk *inject = META_DATA_INJECT_CHUNKS (base->metadata).chunk; @@ -1484,7 +1476,7 @@ goto done; start = filter->duration + start; } - start_type == GST_SEEK_TYPE_SET; + start_type = GST_SEEK_TYPE_SET; if (filter->prepend_buffer) { gst_buffer_unref (filter->prepend_buffer); @@ -1509,7 +1501,7 @@ stop = filter->duration + stop; - stop_type == GST_SEEK_TYPE_SET; + stop_type = GST_SEEK_TYPE_SET; gst_base_metadata_translate_pos_to_orig (filter, stop, &stop, NULL, 0); @@ -1814,8 +1806,6 @@ ret = gst_base_metadata_pull_range_parse (filter); if (ret) { gst_pad_activate_pull (pad, FALSE); gst_pad_activate_push (filter->srcpad, FALSE); Index: gstmetadatademux.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/gstmetadatademux.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gstmetadatademux.c 23 Jan 2008 16:35:34 -0000 1.4 +++ gstmetadatademux.c 31 Jan 2008 10:16:45 -0000 1.5 @@ -310,19 +310,14 @@ gst_metadata_demux_init (GstMetadataDemux * filter, GstMetadataDemuxClass * gclass) - GstElementClass *klass = GST_ELEMENT_GET_CLASS (filter); gst_base_metadata_set_option_flag (GST_BASE_METADATA (filter), META_OPT_EXIF | META_OPT_IPTC | META_OPT_XMP | META_OPT_DEMUX); } static void gst_metadata_demux_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) - GstMetadataDemux *filter = GST_METADATA_DEMUX (object); switch (prop_id) { case ARG_PARSE_ONLY: if (g_value_get_boolean (value)) @@ -360,8 +355,6 @@ gst_metadata_demux_dispose (GObject * object) - GstMetadataDemux *filter = NULL; G_OBJECT_CLASS (metadata_parent_class)->dispose (object); Index: gstmetadatamux.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/gstmetadatamux.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gstmetadatamux.c 23 Jan 2008 16:35:34 -0000 1.12 +++ gstmetadatamux.c 31 Jan 2008 10:16:45 -0000 1.13 @@ -290,8 +290,6 @@ gst_metadata_mux_init (GstMetadataMux * filter, GstMetadataMuxClass * gclass) META_OPT_EXIF | META_OPT_IPTC | META_OPT_XMP | META_OPT_MUX); @@ -301,8 +299,6 @@ gst_metadata_mux_set_property (GObject * object, guint prop_id, - GstMetadataMux *filter = GST_METADATA_MUX (object); default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -314,9 +310,6 @@ gst_metadata_mux_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) - guint8 option = - gst_base_metadata_get_option_flag (GST_BASE_METADATA (object)); @@ -329,8 +322,6 @@ gst_metadata_mux_dispose (GObject * object) - GstMetadataMux *filter = NULL; @@ -362,10 +353,8 @@ GstMetadataMux *filter = GST_METADATA_MUX (base); - GstMessage *msg; GstTagSetter *setter = GST_TAG_SETTER (filter); const GstTagList *taglist = gst_tag_setter_get_tag_list (setter); - GstEvent *event; guint8 *buf = NULL; guint32 size = 0; Index: metadata.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadata.c,v retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- metadata.c 25 Jan 2008 17:45:25 -0000 1.8 +++ metadata.c 31 Jan 2008 10:16:45 -0000 1.9 @@ -168,6 +168,9 @@ else metadatamux_png_dispose (&(*meta_data)->format_data.png_mux); break; + case IMG_NONE: + default: + break; metadata_chunk_array_free (&(*meta_data)->strip_chunks); Index: metadataexif.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataexif.c,v --- metadataexif.c 25 Jan 2008 17:45:25 -0000 1.10 +++ metadataexif.c 31 Jan 2008 10:16:45 -0000 1.11 @@ -428,7 +428,7 @@ char buf[2048]; MEUserData *meudata = (MEUserData *) user_data; - GType type; + GType type = G_TYPE_NONE; ExifByteOrder byte_order; const gchar *tag = metadataparse_exif_get_tag_from_exif (entry->tag, &type); @@ -656,7 +656,7 @@ entry->components = strlen (value) + 1; entry->size = exif_format_get_size (entry->format) * entry->components; - entry->data = value; + entry->data = (guint8 *) value; } break; @@ -667,7 +667,7 @@ ExifShort v_short; if (G_TYPE_UINT == type) { - gst_tag_list_get_uint (list, tag, &value); + gst_tag_list_get_uint (list, tag, (guint *) & value); } else { gst_tag_list_get_int (list, tag, &value); Index: metadataiptc.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataiptc.c,v --- metadataiptc.c 25 Jan 2008 17:45:25 -0000 1.8 +++ metadataiptc.c 31 Jan 2008 10:16:45 -0000 1.9 @@ -444,7 +444,7 @@ iptc_dataset_set_tag (dataset, record, iptc_tag); if (gst_tag_list_get_string (list, tag, &tag_value)) { - iptc_dataset_set_data (dataset, tag_value, strlen (tag_value), + iptc_dataset_set_data (dataset, (guint8 *) tag_value, strlen (tag_value), IPTC_DONT_VALIDATE); g_free (tag_value); tag_value = NULL; Index: metadatamuxjpeg.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadatamuxjpeg.c,v diff -u -d -r1.9 -r1.10 --- metadatamuxjpeg.c 30 Jan 2008 16:05:23 -0000 1.9 +++ metadatamuxjpeg.c 31 Jan 2008 10:16:45 -0000 1.10 @@ -296,7 +296,7 @@ static const char XmpHeader[] = "http://ns.adobe.com/xap/1.0/"; metadatamux_wrap_chunk (&jpeg_data->inject_chunks->chunk[i], - XmpHeader, sizeof (XmpHeader), 0xFF, 0xE1); + (guint8 *) XmpHeader, sizeof (XmpHeader), 0xFF, 0xE1); break; default: @@ -375,9 +375,6 @@ gboolean jfif_found = FALSE; static const char JfifHeader[] = "JFIF"; - static const unsigned char ExifHeader[] = - { 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 }; - static const char XmpHeader[] = "http://ns.adobe.com/xap/1.0/"; *next_start = *buf; Index: metadatamuxpng.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadatamuxpng.c,v retrieving revision 1.6 diff -u -d -r1.6 -r1.7 --- metadatamuxpng.c 30 Jan 2008 16:05:24 -0000 1.6 +++ metadatamuxpng.c 31 Jan 2008 10:16:45 -0000 1.7 @@ -176,8 +176,6 @@ guint32 * bufsize, const guint32 offset, const guint8 * step_buf, guint8 ** next_start, guint32 * next_size); -static void metadatamux_make_crc_table (guint32 crc_table[]); static guint32 metadatamux_update_crc (guint32 crc, guint8 * buf, guint32 len); static guint32 metadatamux_calc_crc (guint8 * buf, guint32 len); @@ -423,8 +421,6 @@ guint32 chunk_size = 0; MetadataChunk chunk; - static const char XmpHeader[] = "XML:com.adobe.xmp"; if (*bufsize < 8) { @@ -475,7 +471,7 @@ * @len: size in bytes of @buf * * Calculates the CRC of a data buffer for a seed @crc. - * @see_also: #metadatamux_make_crc_table #metadatamux_calc_crc + * @see_also: #metadatamux_calc_crc * Returns: the CRC of the bytes buf[0..len-1]. */ Index: metadataparsejpeg.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataparsejpeg.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- metadataparsejpeg.c 30 Jan 2008 16:05:24 -0000 1.15 +++ metadataparsejpeg.c 31 Jan 2008 10:16:45 -0000 1.16 @@ -81,6 +81,7 @@ #include <string.h> #include "metadataparsejpeg.h" +#include "metadataparseutil.h" #ifdef HAVE_IPTC #include <libiptcdata/iptc-jpeg.h> @@ -434,8 +435,6 @@ } else if (mark[1] == 0xE1) { /* may be it is Exif or XMP */ if (chunk_size >= 8) { /* size2 'EXIF' 0x00 0x00 */ - guint8 ch; if (*bufsize < 6) { *next_size = (*buf - *next_start) + 6; ret = META_PARSING_NEED_MORE_DATA; Index: metadataparsepng.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataparsepng.c,v --- metadataparsepng.c 30 Jan 2008 12:56:50 -0000 1.10 +++ metadataparsepng.c 31 Jan 2008 10:16:46 -0000 1.11 @@ -66,6 +66,7 @@ #include "metadataparsepng.h" Index: metadataparseutil.h RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataparseutil.h,v --- metadataparseutil.h 25 Jan 2008 17:45:26 -0000 1.4 +++ metadataparseutil.h 31 Jan 2008 10:16:46 -0000 1.5 @@ -72,5 +72,14 @@ metadataparse_util_jump_chunk (guint32 * read, guint8 ** buf, guint32 * bufsize, guint8 ** next_start, guint32 * next_size); +extern MetadataParsingReturn +metadataparse_util_hold_chunk (guint32 * read, guint8 ** buf, + guint32 * bufsize, guint8 ** next_start, + guint32 * next_size, GstAdapter ** adapter); +metadataparse_util_jump_chunk (guint32 * read, guint8 ** buf, + guint32 * bufsize, guint8 ** next_start, guint32 * next_size); G_END_DECLS #endif /* __GST_METADATAPARSE_UTIL_H__ */ Index: metadataxmp.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataxmp.c,v --- metadataxmp.c 30 Jan 2008 19:19:33 -0000 1.10 +++ metadataxmp.c 31 Jan 2008 10:16:46 -0000 1.11 @@ -289,7 +289,7 @@ buf = gst_adapter_peek (adapter, size); - xmp = xmp_new (buf, size); + xmp = xmp_new ((gchar *) buf, size); if (!xmp) goto done; @@ -338,7 +338,9 @@ if (val) { xmp_chunk = gst_value_get_buffer (val); if (xmp_chunk) - xmp = xmp_new (GST_BUFFER_DATA (xmp_chunk), GST_BUFFER_SIZE (xmp_chunk)); + xmp = + xmp_new ((gchar *) GST_BUFFER_DATA (xmp_chunk), + GST_BUFFER_SIZE (xmp_chunk)); if (NULL == xmp) @@ -825,9 +827,13 @@ uint32_t options = 0; +#ifdef XMP_1_99_5 + if (xmp_get_property (xmp, smap->schema, stagmap->xmp_tag, + NULL, &options)) { +#else if (xmp_get_property_and_bits (xmp, smap->schema, stagmap->xmp_tag, NULL, &options)) { +#endif if (XMP_IS_PROP_SIMPLE (options)) { #ifdef XMP_1_99_5 xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value, 0); |