From 43b16834210591a4a66b2bb10d01079b2615b3f8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 11 Mar 2010 13:32:14 +0100 Subject: [PATCH 1/1] Add -Wmissing-declarations -Wmissing-prototypes to warning flags Includes all the fixes necessary to make stuff compile again. --- configure.ac | 4 +- ext/ogg/Makefile.am | 3 +- ext/ogg/gstogg.c | 8 ++- ext/ogg/gstogg.h | 31 ++++++++++++ ext/ogg/gstoggaviparse.c | 2 + ext/ogg/gstoggdemux.c | 1 + ext/ogg/gstoggdemux.h | 1 + ext/ogg/gstoggmux.c | 58 +++++++++++----------- ext/ogg/gstoggmux.h | 9 ++-- ext/ogg/gstoggparse.c | 1 + ext/ogg/gstoggstream.c | 51 ++----------------- ext/ogg/gstogmparse.c | 2 + ext/ogg/vorbis_parse.c | 1 + ext/ogg/vorbis_parse.h | 30 +++++++++++ ext/theora/gsttheoradec.h | 2 + ext/theora/gsttheoraenc.h | 2 + gst-libs/gst/audio/audio.c | 2 + gst-libs/gst/riff/riff.c | 2 + gst-libs/gst/rtsp/gstrtspbase64.c | 3 ++ gst-libs/gst/rtsp/gstrtspconnection.c | 9 ++++ gst-libs/gst/tag/lang.c | 2 + gst/ffmpegcolorspace/Makefile.am | 1 - gst/ffmpegcolorspace/gstffmpegcolorspace.c | 12 ++++- gst/gdp/gstgdpdepay.h | 2 + gst/gdp/gstgdppay.h | 2 + gst/playback/gstdecodebin2.c | 2 + gst/playback/gstplayback.c | 6 +-- .../gstffmpeg.c => playback/gstplayback.h} | 31 +++--------- gst/playback/gstplaybin.c | 1 + gst/playback/gstplaybin2.c | 1 + gst/playback/gsturidecodebin.c | 1 + gst/videorate/gstvideorate.h | 2 + tests/check/elements/appsink.c | 10 +--- tests/check/elements/audiorate.c | 1 + tests/check/elements/audioresample.c | 4 +- tests/check/libs/cddabasesrc.c | 1 + tests/check/libs/mixer.c | 2 + tests/check/libs/navigation.c | 2 + tests/examples/gio/giosrc-mounting.c | 2 +- 39 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 ext/ogg/gstogg.h create mode 100644 ext/ogg/vorbis_parse.h rename gst/{ffmpegcolorspace/gstffmpeg.c => playback/gstplayback.h} (51%) diff --git a/configure.ac b/configure.ac index 78db208..897e3c6 100644 --- a/configure.ac +++ b/configure.ac @@ -308,10 +308,10 @@ dnl set location of plugin directory AG_GST_SET_PLUGINDIR dnl define an ERROR_CFLAGS Makefile variable -AG_GST_SET_ERROR_CFLAGS($GST_GIT) +AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes]) dnl define an ERROR_CXXFLAGS Makefile variable -AG_GST_SET_ERROR_CXXFLAGS($GST_GIT) +AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes]) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am index 2d15233..1a7f319 100644 --- a/ext/ogg/Makefile.am +++ b/ext/ogg/Makefile.am @@ -11,7 +11,8 @@ libgstogg_la_SOURCES = \ gstoggstream.h \ dirac_parse.c \ dirac_parse.h \ - vorbis_parse.c + vorbis_parse.c \ + vorbis_parse.h noinst_HEADERS = \ gstoggdemux.h gstoggmux.h diff --git a/ext/ogg/gstogg.c b/ext/ogg/gstogg.c index d525aaa..d1f16b8 100644 --- a/ext/ogg/gstogg.c +++ b/ext/ogg/gstogg.c @@ -23,11 +23,9 @@ #include -extern gboolean gst_ogg_demux_plugin_init (GstPlugin * plugin); -extern gboolean gst_ogg_mux_plugin_init (GstPlugin * plugin); -extern gboolean gst_ogm_parse_plugin_init (GstPlugin * plugin); -extern gboolean gst_ogg_parse_plugin_init (GstPlugin * plugin); -extern gboolean gst_ogg_avi_parse_plugin_init (GstPlugin * plugin); +#include "gstogg.h" +#include "gstoggdemux.h" +#include "gstoggmux.h" static gboolean plugin_init (GstPlugin * plugin) diff --git a/ext/ogg/gstogg.h b/ext/ogg/gstogg.h new file mode 100644 index 0000000..6f1393c --- /dev/null +++ b/ext/ogg/gstogg.h @@ -0,0 +1,31 @@ +/* GStreamer + * Copyright (C) 2004 Wim Taymans + * + * gstoggdemux.c: ogg stream demuxer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * 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. + */ + +#ifndef __GST_OGG_H__ +#define __GST_OGG_H__ + +#include + +gboolean gst_ogm_parse_plugin_init (GstPlugin * plugin); +gboolean gst_ogg_parse_plugin_init (GstPlugin * plugin); +gboolean gst_ogg_avi_parse_plugin_init (GstPlugin * plugin); + +#endif /* __GST_OGG_H__ */ diff --git a/ext/ogg/gstoggaviparse.c b/ext/ogg/gstoggaviparse.c index 4b51e01..4dab7da 100644 --- a/ext/ogg/gstoggaviparse.c +++ b/ext/ogg/gstoggaviparse.c @@ -37,6 +37,8 @@ #include #include +#include "gstogg.h" + static const GstElementDetails gst_ogg_avi_parse_details = GST_ELEMENT_DETAILS ("Ogg AVI parser", "Codec/Parser", diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index d8f00ef..07ce75f 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -132,6 +132,7 @@ static GstFlowReturn gst_ogg_demux_combine_flows (GstOggDemux * ogg, GstOggPad * pad, GstFlowReturn ret); static void gst_ogg_demux_sync_streams (GstOggDemux * ogg); +GType gst_ogg_pad_get_type (void); G_DEFINE_TYPE (GstOggPad, gst_ogg_pad, GST_TYPE_PAD); static void diff --git a/ext/ogg/gstoggdemux.h b/ext/ogg/gstoggdemux.h index a47642b..1c69b41 100644 --- a/ext/ogg/gstoggdemux.h +++ b/ext/ogg/gstoggdemux.h @@ -170,6 +170,7 @@ struct _GstOggDemuxClass GstElementClass parent_class; }; +gboolean gst_ogg_demux_plugin_init (GstPlugin * plugin); G_END_DECLS diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index 6c81d8b..f242020 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -282,7 +282,7 @@ gst_ogg_mux_finalize (GObject * object) static void gst_ogg_mux_ogg_pad_destroy_notify (GstCollectData * data) { - GstOggPad *oggpad = (GstOggPad *) data; + GstOggPadData *oggpad = (GstOggPadData *) data; GstBuffer *buf; ogg_stream_clear (&oggpad->stream); @@ -314,7 +314,7 @@ static gboolean gst_ogg_mux_sink_event (GstPad * pad, GstEvent * event) { GstOggMux *ogg_mux = GST_OGG_MUX (gst_pad_get_parent (pad)); - GstOggPad *ogg_pad = (GstOggPad *) gst_pad_get_element_private (pad); + GstOggPadData *ogg_pad = (GstOggPadData *) gst_pad_get_element_private (pad); gboolean ret; GST_DEBUG ("Got %s event on pad %s:%s", GST_EVENT_TYPE_NAME (event), @@ -380,11 +380,11 @@ gst_ogg_mux_request_new_pad (GstElement * element, /* construct our own wrapper data structure for the pad to * keep track of its status */ { - GstOggPad *oggpad; + GstOggPadData *oggpad; - oggpad = (GstOggPad *) + oggpad = (GstOggPadData *) gst_collect_pads_add_pad_full (ogg_mux->collect, newpad, - sizeof (GstOggPad), gst_ogg_mux_ogg_pad_destroy_notify); + sizeof (GstOggPadData), gst_ogg_mux_ogg_pad_destroy_notify); ogg_mux->active_pads++; oggpad->serial = serial; @@ -516,7 +516,7 @@ static gboolean gst_ogg_mux_dequeue_page (GstOggMux * mux, GstFlowReturn * flowret) { GSList *walk; - GstOggPad *opad = NULL; /* "oldest" pad */ + GstOggPadData *opad = NULL; /* "oldest" pad */ GstClockTime oldest = GST_CLOCK_TIME_NONE; GstBuffer *buf = NULL; gboolean ret = FALSE; @@ -525,7 +525,7 @@ gst_ogg_mux_dequeue_page (GstOggMux * mux, GstFlowReturn * flowret) walk = mux->collect->data; while (walk) { - GstOggPad *pad = (GstOggPad *) walk->data; + GstOggPadData *pad = (GstOggPadData *) walk->data; /* We need each queue to either be at EOS, or have one or more pages * available with a set granulepos (i.e. not -1), otherwise we don't have @@ -566,7 +566,7 @@ gst_ogg_mux_dequeue_page (GstOggMux * mux, GstFlowReturn * flowret) walk = mux->collect->data; while (walk) { - GstOggPad *pad = (GstOggPad *) walk->data; + GstOggPadData *pad = (GstOggPadData *) walk->data; /* any page with a granulepos of -1 can be pushed immediately. * TODO: it CAN be, but it seems silly to do so? */ @@ -629,8 +629,8 @@ gst_ogg_mux_dequeue_page (GstOggMux * mux, GstFlowReturn * flowret) * counting. */ static GstFlowReturn -gst_ogg_mux_pad_queue_page (GstOggMux * mux, GstOggPad * pad, ogg_page * page, - gboolean delta) +gst_ogg_mux_pad_queue_page (GstOggMux * mux, GstOggPadData * pad, + ogg_page * page, gboolean delta) { GstFlowReturn ret; GstBuffer *buffer = gst_ogg_mux_buffer_from_page (mux, page, delta); @@ -671,8 +671,8 @@ gst_ogg_mux_pad_queue_page (GstOggMux * mux, GstOggPad * pad, ogg_page * page, * of muxed pages */ static gint -gst_ogg_mux_compare_pads (GstOggMux * ogg_mux, GstOggPad * first, - GstOggPad * second) +gst_ogg_mux_compare_pads (GstOggMux * ogg_mux, GstOggPadData * first, + GstOggPadData * second) { guint64 firsttime, secondtime; @@ -731,20 +731,20 @@ gst_ogg_mux_compare_pads (GstOggMux * ogg_mux, GstOggPad * first, * NULL when no pad was usable. "best" means the buffer marked * with the lowest timestamp. If best->buffer == NULL then nothing * should be done until more data arrives */ -static GstOggPad * +static GstOggPadData * gst_ogg_mux_queue_pads (GstOggMux * ogg_mux) { - GstOggPad *bestpad = NULL, *still_hungry = NULL; + GstOggPadData *bestpad = NULL, *still_hungry = NULL; GSList *walk; /* try to make sure we have a buffer from each usable pad first */ walk = ogg_mux->collect->data; while (walk) { - GstOggPad *pad; + GstOggPadData *pad; GstCollectData *data; data = (GstCollectData *) walk->data; - pad = (GstOggPad *) data; + pad = (GstOggPadData *) data; walk = g_slist_next (walk); @@ -840,7 +840,7 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux) } static GList * -gst_ogg_mux_get_headers (GstOggPad * pad) +gst_ogg_mux_get_headers (GstOggPadData * pad) { GList *res = NULL; GstStructure *structure; @@ -957,10 +957,10 @@ gst_ogg_mux_send_headers (GstOggMux * mux) walk = mux->collect->data; while (walk) { - GstOggPad *pad; + GstOggPadData *pad; GstPad *thepad; - pad = (GstOggPad *) walk->data; + pad = (GstOggPadData *) walk->data; thepad = pad->collect.pad; walk = g_slist_next (walk); @@ -978,7 +978,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux) GST_LOG_OBJECT (mux, "creating BOS pages"); walk = mux->collect->data; while (walk) { - GstOggPad *pad; + GstOggPadData *pad; GstBuffer *buf; ogg_packet packet; ogg_page page; @@ -987,7 +987,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux) GstStructure *structure; GstBuffer *hbuf; - pad = (GstOggPad *) walk->data; + pad = (GstOggPadData *) walk->data; thepad = pad->collect.pad; caps = gst_pad_get_negotiated_caps (thepad); structure = gst_caps_get_structure (caps, 0); @@ -1063,10 +1063,10 @@ gst_ogg_mux_send_headers (GstOggMux * mux) GST_LOG_OBJECT (mux, "creating next headers"); walk = mux->collect->data; while (walk) { - GstOggPad *pad; + GstOggPadData *pad; GstPad *thepad; - pad = (GstOggPad *) walk->data; + pad = (GstOggPadData *) walk->data; thepad = pad->collect.pad; walk = walk->next; @@ -1168,7 +1168,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux) * pads are at EOS) */ static GstFlowReturn -gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best) +gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPadData * best) { GstFlowReturn ret = GST_FLOW_OK; gboolean delta_unit; @@ -1191,7 +1191,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best) * for the pad we were pulling from before */ if (ogg_mux->pulling && best && ogg_mux->pulling != best && ogg_mux->pulling->buffer) { - GstOggPad *pad = ogg_mux->pulling; + GstOggPadData *pad = ogg_mux->pulling; GstClockTime last_ts = GST_BUFFER_END_TIME (pad->buffer); @@ -1249,7 +1249,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best) ogg_packet packet; ogg_page page; GstBuffer *buf, *tmpbuf; - GstOggPad *pad = ogg_mux->pulling; + GstOggPadData *pad = ogg_mux->pulling; gint64 duration; gboolean force_flush; @@ -1497,7 +1497,7 @@ beach: static GstFlowReturn gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux) { - GstOggPad *best; + GstOggPadData *best; GstFlowReturn ret; gint activebefore; @@ -1593,7 +1593,7 @@ gst_ogg_mux_init_collectpads (GstCollectPads * collect) walk = collect->data; while (walk) { - GstOggPad *oggpad = (GstOggPad *) walk->data; + GstOggPadData *oggpad = (GstOggPadData *) walk->data; ogg_stream_init (&oggpad->stream, oggpad->serial); oggpad->packetno = 0; @@ -1617,7 +1617,7 @@ gst_ogg_mux_clear_collectpads (GstCollectPads * collect) GSList *walk; for (walk = collect->data; walk; walk = g_slist_next (walk)) { - GstOggPad *oggpad = (GstOggPad *) walk->data; + GstOggPadData *oggpad = (GstOggPadData *) walk->data; GstBuffer *buf; ogg_stream_clear (&oggpad->stream); diff --git a/ext/ogg/gstoggmux.h b/ext/ogg/gstoggmux.h index fc0944f..6134d5e 100644 --- a/ext/ogg/gstoggmux.h +++ b/ext/ogg/gstoggmux.h @@ -24,6 +24,7 @@ #include #include +#include G_BEGIN_DECLS @@ -82,7 +83,7 @@ typedef struct gboolean always_flush_page; } -GstOggPad; +GstOggPadData; /** * GstOggMux: @@ -103,7 +104,7 @@ struct _GstOggMux gint active_pads; /* the pad we are currently using to fill a page */ - GstOggPad *pulling; + GstOggPadData *pulling; /* next timestamp for the page */ GstClockTime next_ts; @@ -120,7 +121,7 @@ struct _GstOggMux guint64 max_delay; guint64 max_page_delay; - GstOggPad *delta_pad; /* when a delta frame is detected on a stream, we mark + GstOggPadData *delta_pad; /* when a delta frame is detected on a stream, we mark pages as delta frames up to the page that has the keyframe */ @@ -133,6 +134,8 @@ struct _GstOggMuxClass GType gst_ogg_mux_get_type (void); +gboolean gst_ogg_mux_plugin_init (GstPlugin * plugin); + G_END_DECLS #endif /* __GST_OGG_MUX_H__ */ diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c index a86958b..66071bd 100644 --- a/ext/ogg/gstoggparse.c +++ b/ext/ogg/gstoggparse.c @@ -36,6 +36,7 @@ #include #include +#include "gstogg.h" #include "gstoggstream.h" static const GstElementDetails gst_ogg_parse_details = diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index 391337c..66192cc 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -24,9 +24,11 @@ #include "gstoggstream.h" #include "dirac_parse.h" +#include "vorbis_parse.h" #include +#include #include GST_DEBUG_CATEGORY_EXTERN (gst_ogg_demux_debug); @@ -165,6 +167,7 @@ gst_ogg_stream_granule_to_granulepos (GstOggStream * pad, gint64 granule, keyframe_granule); } +#if 0 gboolean gst_ogg_stream_packet_granulepos_is_key_frame (GstOggStream * pad, gint64 granulepos) @@ -180,6 +183,7 @@ gst_ogg_stream_packet_granulepos_is_key_frame (GstOggStream * pad, return mappers[pad->map].is_key_frame_func (pad, granulepos); } +#endif gboolean gst_ogg_stream_packet_is_header (GstOggStream * pad, ogg_packet * packet) @@ -459,10 +463,6 @@ granule_to_granulepos_dirac (GstOggStream * pad, gint64 granule, /* vorbis */ -void parse_vorbis_header_packet (GstOggStream * pad, ogg_packet * op); -void parse_vorbis_setup_packet (GstOggStream * pad, ogg_packet * op); - - static gboolean setup_vorbis_mapper (GstOggStream * pad, ogg_packet * packet) { @@ -708,49 +708,6 @@ setup_fishead_mapper (GstOggStream * pad, ogg_packet * packet) return TRUE; } -gboolean -gst_ogg_map_add_fisbone (GstOggStream * pad, - const guint8 * data, guint size, GstClockTime * p_start_time, - guint32 * p_preroll) -{ - GstClockTime start_time; - gint64 start_granule; - guint32 preroll; - - if (size < SKELETON_FISBONE_MIN_SIZE || memcmp (data, "fisbone\0", 8) != 0) { - GST_WARNING ("invalid fisbone packet, ignoring"); - return FALSE; - } - - if (pad->have_fisbone) { - GST_DEBUG ("already have fisbone, ignoring second one"); - return FALSE; - } - - /* skip "fisbone\0" + headers offset + serialno + num headers */ - data += 8 + 4 + 4 + 4; - - pad->have_fisbone = TRUE; - - /* we just overwrite whatever was set before by the format-specific setup */ - pad->granulerate_n = GST_READ_UINT64_LE (data); - pad->granulerate_d = GST_READ_UINT64_LE (data + 8); - - start_granule = GST_READ_UINT64_LE (data + 16); - preroll = GST_READ_UINT32_LE (data + 24); - pad->granuleshift = GST_READ_UINT8 (data + 28); - - start_time = granulepos_to_granule_default (pad, start_granule); - - if (p_start_time) - *p_start_time = start_time; - - if (p_preroll) - *p_preroll = preroll; - - return TRUE; -} - /* Do we need these for something? * ogm->hdr.size = GST_READ_UINT32_LE (&data[13]); * ogm->hdr.time_unit = GST_READ_UINT64_LE (&data[17]); diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c index 31dcd90..b79b5e6 100644 --- a/ext/ogg/gstogmparse.c +++ b/ext/ogg/gstogmparse.c @@ -30,6 +30,8 @@ #include #include +#include "gstogg.h" + GST_DEBUG_CATEGORY_STATIC (gst_ogm_parse_debug); #define GST_CAT_DEFAULT gst_ogm_parse_debug diff --git a/ext/ogg/vorbis_parse.c b/ext/ogg/vorbis_parse.c index f9ba746..844f18b 100644 --- a/ext/ogg/vorbis_parse.c +++ b/ext/ogg/vorbis_parse.c @@ -45,6 +45,7 @@ #include #include "gstoggstream.h" +#include "vorbis_parse.h" /* * Vorbis packets can be short or long, and each packet overlaps the previous diff --git a/ext/ogg/vorbis_parse.h b/ext/ogg/vorbis_parse.h new file mode 100644 index 0000000..9a8781b --- /dev/null +++ b/ext/ogg/vorbis_parse.h @@ -0,0 +1,30 @@ +/* GStreamer + * Copyright (C) 2004 Wim Taymans + * + * gstoggdemux.c: ogg stream demuxer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * 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. + */ + +#ifndef __GST_VORBIS_PARSE_H__ +#define __GST_VORBIS_PARSE_H__ + +#include + +void parse_vorbis_header_packet (GstOggStream * pad, ogg_packet * packet); +void parse_vorbis_setup_packet (GstOggStream * pad, ogg_packet * op); + +#endif /* __GST_VORBIS_PARSE_H__ */ diff --git a/ext/theora/gsttheoradec.h b/ext/theora/gsttheoradec.h index 14f806c..6e9b138 100644 --- a/ext/theora/gsttheoradec.h +++ b/ext/theora/gsttheoradec.h @@ -105,6 +105,8 @@ struct _GstTheoraDecClass GstElementClass parent_class; }; +GType gst_theora_dec_get_type (void); + G_END_DECLS #endif /* __GST_THEORADEC_H__ */ diff --git a/ext/theora/gsttheoraenc.h b/ext/theora/gsttheoraenc.h index 3efdab2..b6ab95e 100644 --- a/ext/theora/gsttheoraenc.h +++ b/ext/theora/gsttheoraenc.h @@ -110,6 +110,8 @@ struct _GstTheoraEncClass GstElementClass parent_class; }; +GType gst_theora_enc_get_type (void); + G_END_DECLS #endif /* __GST_THEORAENC_H__ */ diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index 86b8885..bf99a52 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -237,6 +237,8 @@ typedef enum GST_AUDIO_FIELD_DEPTH = (1 << 4), GST_AUDIO_FIELD_SIGNED = (1 << 5), } GstAudioFieldFlag; +void +gst_audio_structure_set_int (GstStructure * structure, GstAudioFieldFlag flag); #endif /* GST_DISABLE_DEPRECATED */ void diff --git a/gst-libs/gst/riff/riff.c b/gst-libs/gst/riff/riff.c index a8e267c..d14b32a 100644 --- a/gst-libs/gst/riff/riff.c +++ b/gst-libs/gst/riff/riff.c @@ -32,6 +32,8 @@ #include +#include "riff-read.h" + GST_DEBUG_CATEGORY (riff_debug); /** diff --git a/gst-libs/gst/rtsp/gstrtspbase64.c b/gst-libs/gst/rtsp/gstrtspbase64.c index 9aca1e0..b96e2d7 100644 --- a/gst-libs/gst/rtsp/gstrtspbase64.c +++ b/gst-libs/gst/rtsp/gstrtspbase64.c @@ -46,6 +46,9 @@ */ /* This isn't efficient, but it doesn't need to be */ #ifndef GST_REMOVE_DEPRECATED +#ifdef GST_DISABLE_DEPRECATED +gchar *gst_rtsp_base64_encode (const gchar * data, gsize len); +#endif gchar * gst_rtsp_base64_encode (const gchar * data, gsize len) { diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c index c03680c..c45f639 100644 --- a/gst-libs/gst/rtsp/gstrtspconnection.c +++ b/gst-libs/gst/rtsp/gstrtspconnection.c @@ -3505,6 +3505,11 @@ gst_rtsp_watch_send_message (GstRTSPWatch * watch, GstRTSPMessage * message, * Since: 0.10.24 */ #ifndef GST_REMOVE_DEPRECATED +#ifdef GST_DISABLE_DEPRECATED +guint +gst_rtsp_watch_queue_data (GstRTSPWatch * watch, const guint8 * data, + guint size); +#endif guint gst_rtsp_watch_queue_data (GstRTSPWatch * watch, const guint8 * data, guint size) @@ -3560,6 +3565,10 @@ gst_rtsp_watch_queue_data (GstRTSPWatch * watch, const guint8 * data, * Since: 0.10.23 */ #ifndef GST_REMOVE_DEPRECATED +#ifdef GST_DISABLE_DEPRECATED +guint +gst_rtsp_watch_queue_message (GstRTSPWatch * watch, GstRTSPMessage * message); +#endif guint gst_rtsp_watch_queue_message (GstRTSPWatch * watch, GstRTSPMessage * message) { diff --git a/gst-libs/gst/tag/lang.c b/gst-libs/gst/tag/lang.c index dc212ef..eb5c036 100644 --- a/gst-libs/gst/tag/lang.c +++ b/gst-libs/gst/tag/lang.c @@ -44,9 +44,11 @@ #include #include + #include #include +#include "tag.h" #include "lang-tables.dat" /* FIXME: remove once we depend on GLib >= 2.22 */ diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am index 2893fc4..053b423 100644 --- a/gst/ffmpegcolorspace/Makefile.am +++ b/gst/ffmpegcolorspace/Makefile.am @@ -1,7 +1,6 @@ plugin_LTLIBRARIES = libgstffmpegcolorspace.la libgstffmpegcolorspace_la_SOURCES = \ - gstffmpeg.c \ gstffmpegcolorspace.c \ gstffmpegcodecmap.c \ dsputil.c \ diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index 714b01f..3d49f7f 100644 --- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c @@ -547,8 +547,8 @@ not_supported: } } -gboolean -gst_ffmpegcolorspace_register (GstPlugin * plugin) +static gboolean +plugin_init (GstPlugin * plugin) { GstCaps *caps; @@ -556,6 +556,8 @@ gst_ffmpegcolorspace_register (GstPlugin * plugin) "FFMPEG-based colorspace converter"); GST_DEBUG_CATEGORY_GET (ffmpegcolorspace_performance, "GST_PERFORMANCE"); + avcodec_init (); + /* template caps */ caps = gst_ffmpegcsp_codectype_to_caps (CODEC_TYPE_VIDEO, NULL); @@ -569,3 +571,9 @@ gst_ffmpegcolorspace_register (GstPlugin * plugin) return gst_element_register (plugin, "ffmpegcolorspace", GST_RANK_NONE, GST_TYPE_FFMPEGCSP); } + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "ffmpegcolorspace", + "colorspace conversion copied from FFMpeg " FFMPEG_VERSION, + plugin_init, VERSION, "LGPL", "FFMpeg", "http://ffmpeg.sourceforge.net/") diff --git a/gst/gdp/gstgdpdepay.h b/gst/gdp/gstgdpdepay.h index f1f41ac..64b7db2 100644 --- a/gst/gdp/gstgdpdepay.h +++ b/gst/gdp/gstgdpdepay.h @@ -75,6 +75,8 @@ struct _GstGDPDepayClass gboolean gst_gdp_depay_plugin_init (GstPlugin * plugin); +GType gst_gdp_depay_get_type (void); + G_END_DECLS #endif /* __GST_GDP_DEPAY_H__ */ diff --git a/gst/gdp/gstgdppay.h b/gst/gdp/gstgdppay.h index 0cc360e..3e280b5 100644 --- a/gst/gdp/gstgdppay.h +++ b/gst/gdp/gstgdppay.h @@ -74,6 +74,8 @@ struct _GstGDPPayClass gboolean gst_gdp_pay_plugin_init (GstPlugin * plugin); +GType gst_gdp_pay_get_type (void); + G_END_DECLS #endif /* __GST_GDP_PAY_H__ */ diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index d05c698..fcefecd 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -89,6 +89,7 @@ #include "gstplay-marshal.h" #include "gstplay-enum.h" +#include "gstplayback.h" #include "gstfactorylists.h" #include "gstrawcaps.h" @@ -465,6 +466,7 @@ struct _GstDecodePad gboolean drained; /* an EOS has been seen on the pad */ }; +GType gst_decode_pad_get_type (void); G_DEFINE_TYPE (GstDecodePad, gst_decode_pad, GST_TYPE_GHOST_PAD); #define GST_TYPE_DECODE_PAD (gst_decode_pad_get_type ()) #define GST_DECODE_PAD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DECODE_PAD,GstDecodePad)) diff --git a/gst/playback/gstplayback.c b/gst/playback/gstplayback.c index a4db4241..a83fee1 100644 --- a/gst/playback/gstplayback.c +++ b/gst/playback/gstplayback.c @@ -27,14 +27,12 @@ #include #include +#include "gstplayback.h" +#include "gstplaysink.h" #include "gststreamselector.h" #include "gststreaminfo.h" -#include "gstplaysink.h" #include "gstsubtitleoverlay.h" -gboolean gst_play_bin_plugin_init (GstPlugin * plugin); -gboolean gst_play_bin2_plugin_init (GstPlugin * plugin); - static gboolean plugin_init (GstPlugin * plugin) { diff --git a/gst/ffmpegcolorspace/gstffmpeg.c b/gst/playback/gstplayback.h similarity index 51% rename from gst/ffmpegcolorspace/gstffmpeg.c rename to gst/playback/gstplayback.h index a8d9e03..e50705d 100644 --- a/gst/ffmpegcolorspace/gstffmpeg.c +++ b/gst/playback/gstplayback.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <1999> Erik Walthinsen + * Copyright (C) <2007> Wim Taymans * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,32 +17,15 @@ * Boston, MA 02111-1307, USA. */ -/* First, include the header file for the plugin, to bring in the - * object definition and other useful things. - */ +#ifndef __GST_PLAY_BACK_H__ +#define __GST_PLAY_BACK_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include -#include "avcodec.h" - -extern gboolean gst_ffmpegcolorspace_register (GstPlugin * plugin); - -static gboolean -plugin_init (GstPlugin * plugin) -{ - avcodec_init (); - gst_ffmpegcolorspace_register (plugin); +gboolean gst_decode_bin_plugin_init (GstPlugin * plugin); +gboolean gst_play_bin_plugin_init (GstPlugin * plugin); +gboolean gst_play_bin2_plugin_init (GstPlugin * plugin); - /* Now we can return the pointer to the newly created Plugin object. */ - return TRUE; -} -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "ffmpegcolorspace", - "colorspace conversion copied from FFMpeg " FFMPEG_VERSION, - plugin_init, VERSION, "LGPL", "FFMpeg", "http://ffmpeg.sourceforge.net/") +#endif /* __GST_PLAY_SINK_H__ */ diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c index 8d8ae29..f044c61 100644 --- a/gst/playback/gstplaybin.c +++ b/gst/playback/gstplaybin.c @@ -230,6 +230,7 @@ #include #include "gstplaybasebin.h" +#include "gstplayback.h" GST_DEBUG_CATEGORY_STATIC (gst_play_bin_debug); #define GST_CAT_DEFAULT gst_play_bin_debug diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index f76a30e..5cf4d91 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -229,6 +229,7 @@ #include "gstplay-enum.h" #include "gstplay-marshal.h" +#include "gstplayback.h" #include "gstplaysink.h" #include "gstfactorylists.h" #include "gstinputselector.h" diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 09f24af..b19459b 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -179,6 +179,7 @@ enum static guint gst_uri_decode_bin_signals[LAST_SIGNAL] = { 0 }; +GType gst_uri_decode_bin_get_type (void); GST_BOILERPLATE (GstURIDecodeBin, gst_uri_decode_bin, GstBin, GST_TYPE_BIN); static void remove_decoders (GstURIDecodeBin * bin, gboolean force); diff --git a/gst/videorate/gstvideorate.h b/gst/videorate/gstvideorate.h index a1a5007..4d6c061 100644 --- a/gst/videorate/gstvideorate.h +++ b/gst/videorate/gstvideorate.h @@ -74,6 +74,8 @@ struct _GstVideoRateClass GstElementClass parent_class; }; +GType gst_video_rate_get_type (void); + G_END_DECLS #endif /* __GST_VIDEO_RATE_H__ */ diff --git a/tests/check/elements/appsink.c b/tests/check/elements/appsink.c index f8bc68d..b91d9a7 100644 --- a/tests/check/elements/appsink.c +++ b/tests/check/elements/appsink.c @@ -56,18 +56,12 @@ cleanup_appsink (GstElement * appsink) * The exact operation performed doesn't matter. Currently it multiplies with * two, but it could do anything. The idea is to use the function to verify * that the code calling it gets run. */ -gint +static gint operate_on_data (gint indata) { return indata * 2; } -void -notify_test_function (gpointer userdata) -{ - global_testdata = operate_on_data (GPOINTER_TO_INT (userdata)); -} - static GstFlowReturn callback_function (GstAppSink * appsink, gpointer callback_data) { @@ -76,7 +70,7 @@ callback_function (GstAppSink * appsink, gpointer callback_data) return GST_FLOW_OK; } -void +static void notify_function (gpointer callback_data) { global_testdata = operate_on_data (*((gint *) callback_data)); diff --git a/tests/check/elements/audiorate.c b/tests/check/elements/audiorate.c index 75654dd..7845672 100644 --- a/tests/check/elements/audiorate.c +++ b/tests/check/elements/audiorate.c @@ -30,6 +30,7 @@ static gdouble injector_inject_probability = 0.0; typedef GstElement TestInjector; typedef GstElementClass TestInjectorClass; +GType test_injector_get_type (void); GST_BOILERPLATE (TestInjector, test_injector, GstElement, GST_TYPE_ELEMENT); #define INJECTOR_CAPS \ diff --git a/tests/check/elements/audioresample.c b/tests/check/elements/audioresample.c index 4a67a9e..a9a2e3b 100644 --- a/tests/check/elements/audioresample.c +++ b/tests/check/elements/audioresample.c @@ -761,7 +761,7 @@ typedef struct guint64 in_buffer_count, out_buffer_count; } TimestampDriftCtx; -void +static void fakesink_handoff_cb (GstElement * object, GstBuffer * buffer, GstPad * pad, gpointer user_data) { @@ -816,7 +816,7 @@ fakesink_handoff_cb (GstElement * object, GstBuffer * buffer, GstPad * pad, ctx->next_out_off = GST_BUFFER_OFFSET_END (buffer); } -void +static void identity_handoff_cb (GstElement * object, GstBuffer * buffer, gpointer user_data) { diff --git a/tests/check/libs/cddabasesrc.c b/tests/check/libs/cddabasesrc.c index 33685d8..abe7c2c 100644 --- a/tests/check/libs/cddabasesrc.c +++ b/tests/check/libs/cddabasesrc.c @@ -182,6 +182,7 @@ struct _GstCdFooSrcClass GstCddaBaseSrcClass parent_class; }; +GType gst_cd_foo_src_get_type (void); GST_BOILERPLATE (GstCdFooSrc, gst_cd_foo_src, GstCddaBaseSrc, GST_TYPE_CDDA_BASE_SRC); diff --git a/tests/check/libs/mixer.c b/tests/check/libs/mixer.c index 1133ecb..2dfd284 100644 --- a/tests/check/libs/mixer.c +++ b/tests/check/libs/mixer.c @@ -45,6 +45,8 @@ struct TestElementClass GstElementClass parent_class; }; +GType test_element_get_type (void); + static void init_interface (GType type); static void gst_implements_interface_init (GstImplementsInterfaceClass * klass); diff --git a/tests/check/libs/navigation.c b/tests/check/libs/navigation.c index 4712947..e3928d1 100644 --- a/tests/check/libs/navigation.c +++ b/tests/check/libs/navigation.c @@ -51,6 +51,8 @@ struct TestElementClass GstElementClass parent_class; }; +GType test_element_get_type (void); + static void init_interface (GType type); static void gst_implements_interface_init (GstImplementsInterfaceClass * klass); static void nav_send_event (GstNavigation * navigation, diff --git a/tests/examples/gio/giosrc-mounting.c b/tests/examples/gio/giosrc-mounting.c index b6d4731..8ca4a3c 100644 --- a/tests/examples/gio/giosrc-mounting.c +++ b/tests/examples/gio/giosrc-mounting.c @@ -45,7 +45,7 @@ mount_cb (GObject * obj, GAsyncResult * res, gpointer user_data) } } -gboolean +static gboolean message_handler (GstBus * bus, GstMessage * message, gpointer user_data) { -- 2.7.4