diff --git a/common b/common index 762b6927ff..a62f3d4acd 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 762b6927ffdd1726cb4f4783f49b5cfaa9edd941 +Subproject commit a62f3d4acded1a2913cfe6125a5831274d55c52b diff --git a/configure.ac b/configure.ac index f74ae22db5..53d02e2a18 100644 --- a/configure.ac +++ b/configure.ac @@ -365,20 +365,25 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], ["${srcdir}/gst-plugins-base.doap"], [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) +# set by AG_GST_PARSE_SUBSYSTEM_DISABLES above +dnl make sure it doesn't complain about unused variables if debugging is disabled +NO_WARNINGS="" +AG_GST_CHECK_GST_DEBUG_DISABLED([NO_WARNINGS="-Wno-unused"], [NO_WARNINGS=""]) + dnl define an ERROR_CFLAGS Makefile variable dnl -Wformat-nonliteral - see ext/pango/gstclockoverlay.c and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39438 AG_GST_SET_ERROR_CFLAGS($GST_GIT, [ -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return - -Wno-multichar -Wnested-externs ]) + -Wno-multichar -Wnested-externs $NO_WARNINGS]) dnl define an ERROR_CXXFLAGS Makefile variable AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [ -Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return - -Wno-multichar]) + -Wno-multichar $NO_WARNINGS]) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) diff --git a/gst-libs/gst/audio/gstaudioiec61937.c b/gst-libs/gst/audio/gstaudioiec61937.c index 5742d282b7..000152561b 100644 --- a/gst-libs/gst/audio/gstaudioiec61937.c +++ b/gst-libs/gst/audio/gstaudioiec61937.c @@ -22,7 +22,7 @@ /** * SECTION:gstaudioiec61937 * @short_description: Utility functions for IEC 61937 payloading - * @since: 0.10.35 + * @since: 0.10.36 * * This module contains some helper functions for encapsulating various * audio formats in IEC 61937 headers and padding. @@ -69,7 +69,7 @@ caps_get_string_field (const GstCaps * caps, const gchar * field) * Returns: the size or 0 if the given @type is not supported or cannot be * payloaded. * - * Since: 0.10.35 + * Since: 0.10.36 */ guint gst_audio_iec61937_frame_size (const GstRingBufferSpec * spec) @@ -145,7 +145,7 @@ gst_audio_iec61937_frame_size (const GstRingBufferSpec * spec) * Returns: transfer-full: %TRUE if the payloading was successful, %FALSE * otherwise. * - * Since: 0.10.35 + * Since: 0.10.36 */ gboolean gst_audio_iec61937_payload (const guint8 * src, guint src_n, guint8 * dst, diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c index 46024b925a..b73558e5d0 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -249,7 +249,7 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass) * Controls the amount of time in nanoseconds that timestamps are allowed * to drift from their ideal time before choosing not to align them. * - * Since: 0.10.26 + * Since: 0.10.36 */ g_object_class_install_property (gobject_class, PROP_ALIGNMENT_THRESHOLD, g_param_spec_int64 ("alignment-threshold", "Alignment Threshold", @@ -262,6 +262,8 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass) * * A window of time in nanoseconds to wait before creating a discontinuity as * a result of breaching the drift-tolerance. + * + * Since: 0.10.36 */ g_object_class_install_property (gobject_class, PROP_DISCONT_WAIT, g_param_spec_int64 ("discont-wait", "Discont Wait", @@ -687,7 +689,7 @@ gst_base_audio_sink_get_drift_tolerance (GstBaseAudioSink * sink) * * Controls the sink's alignment threshold. * - * Since: 0.10.31 + * Since: 0.10.36 */ void gst_base_audio_sink_set_alignment_threshold (GstBaseAudioSink * sink, @@ -708,7 +710,7 @@ gst_base_audio_sink_set_alignment_threshold (GstBaseAudioSink * sink, * * Returns: The current alignment threshold used by @sink. * - * Since: 0.10.31 + * Since: 0.10.36 */ GstClockTime gst_base_audio_sink_get_alignment_threshold (GstBaseAudioSink * sink) @@ -731,7 +733,7 @@ gst_base_audio_sink_get_alignment_threshold (GstBaseAudioSink * sink) * * Controls how long the sink will wait before creating a discontinuity. * - * Since: 0.10.31 + * Since: 0.10.36 */ void gst_base_audio_sink_set_discont_wait (GstBaseAudioSink * sink, @@ -752,7 +754,7 @@ gst_base_audio_sink_set_discont_wait (GstBaseAudioSink * sink, * * Returns: The current discont wait used by @sink. * - * Since: 0.10.31 + * Since: 0.10.36 */ GstClockTime gst_base_audio_sink_get_discont_wait (GstBaseAudioSink * sink) diff --git a/gst-libs/gst/audio/gstbaseaudiosink.h b/gst-libs/gst/audio/gstbaseaudiosink.h index e349d8766b..2064ac0b7c 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.h +++ b/gst-libs/gst/audio/gstbaseaudiosink.h @@ -140,7 +140,7 @@ struct _GstBaseAudioSink { * @payload: payload data in a format suitable to write to the sink. If no * payloading is required, returns a reffed copy of the original * buffer, else returns the payloaded buffer with all other metadata - * copied. (Since: 0.10.35) + * copied. (Since: 0.10.36) * * #GstBaseAudioSink class. Override the vmethod to implement * functionality. diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index 4f73aaf89a..50a560dde9 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -1270,6 +1270,19 @@ message_received (GstBus * bus, GstMessage * message, GstPipeline * pipeline) { const GstStructure *s; + switch (GST_MESSAGE_TYPE (message)) { + case GST_MESSAGE_ERROR: + GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline), + GST_DEBUG_GRAPH_SHOW_ALL, "seek.error"); + break; + case GST_MESSAGE_WARNING: + GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline), + GST_DEBUG_GRAPH_SHOW_ALL, "seek.warning"); + break; + default: + break; + } + s = gst_message_get_structure (message); g_print ("message from \"%s\" (%s): ", GST_STR_NULL (GST_ELEMENT_NAME (GST_MESSAGE_SRC (message))), @@ -1450,6 +1463,19 @@ msg_state_changed (GstBus * bus, GstMessage * message, GstPipeline * pipeline) } else { set_update_scale (FALSE); } + + /* dump graph for (some) pipeline state changes */ + { + gchar *dump_name; + + dump_name = g_strdup_printf ("seek.%s_%s", + gst_element_state_get_name (old), gst_element_state_get_name (new)); + + GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline), + GST_DEBUG_GRAPH_SHOW_ALL, dump_name); + + g_free (dump_name); + } } } diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def index 79cf6d92ef..b660865b94 100644 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@ -76,10 +76,14 @@ EXPORTS gst_audio_sink_get_type gst_audio_src_get_type gst_base_audio_sink_create_ringbuffer + gst_base_audio_sink_get_alignment_threshold + gst_base_audio_sink_get_discont_wait gst_base_audio_sink_get_drift_tolerance gst_base_audio_sink_get_provide_clock gst_base_audio_sink_get_slave_method gst_base_audio_sink_get_type + gst_base_audio_sink_set_alignment_threshold + gst_base_audio_sink_set_discont_wait gst_base_audio_sink_set_drift_tolerance gst_base_audio_sink_set_provide_clock gst_base_audio_sink_set_slave_method