From d7fc45f42e776408048958e7a7a74f298ad3c309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 7 Nov 2011 23:05:44 +0000 Subject: [PATCH 1/5] docs: fix up some Since: markers --- ext/pango/gsttextoverlay.c | 4 ++-- gst-libs/gst/audio/gstaudioiec61937.c | 6 +++--- gst-libs/gst/audio/gstbaseaudiosink.c | 12 +++++++----- gst-libs/gst/audio/gstbaseaudiosink.h | 2 +- gst-libs/gst/video/video.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index ac2e4a6b0e..e33ee5a4a3 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -436,7 +436,7 @@ gst_text_overlay_class_init (GstTextOverlayClass * klass) * * Whether to display a shadow of each letter under the text. * - * Since: 0.10.35 + * Since: 0.10.36 **/ g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SHADOW, g_param_spec_boolean ("shadow", "create shadow of text", @@ -527,7 +527,7 @@ gst_text_overlay_class_init (GstTextOverlayClass * klass) * * Color of the outline of the rendered text. * - * Since: 0.10.35 + * Since: 0.10.36 **/ g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_OUTLINE_COLOR, g_param_spec_uint ("outline-color", "Text Outline Color", diff --git a/gst-libs/gst/audio/gstaudioiec61937.c b/gst-libs/gst/audio/gstaudioiec61937.c index 9ad787b3d9..b6a3266866 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 eb4a0a3a4c..9f9d0a1afd 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -252,7 +252,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", @@ -265,6 +265,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", @@ -714,7 +716,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, @@ -735,7 +737,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) @@ -758,7 +760,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, @@ -779,7 +781,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 e41a46a500..34a99c9397 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.h +++ b/gst-libs/gst/audio/gstbaseaudiosink.h @@ -144,7 +144,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/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c index 4b64cfc8f5..af4c122606 100644 --- a/gst-libs/gst/video/video.c +++ b/gst-libs/gst/video/video.c @@ -2081,7 +2081,7 @@ gst_video_format_get_size (GstVideoFormat format, int width, int height) * Calculates the total number of bytes in the raw video format for the given * caps. This number should be used when allocating a buffer for raw video. * - * Since: 0.10.34 + * Since: 0.10.36 * * Returns: %TRUE if the size could be calculated from the caps */ From c6c6c2e75e57e827418e9f7ff2db55c544736884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 7 Nov 2011 23:41:33 +0000 Subject: [PATCH 2/5] examples: sprinkle GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS in seek test utility https://bugzilla.gnome.org/show_bug.cgi?id=630497 --- tests/examples/seek/seek.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index 216a00a317..8dbd2682d5 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -2131,6 +2131,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))), @@ -2311,6 +2324,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); + } } } From a08f0c1a22ec2264447f2055bfe7cc677547729a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 8 Nov 2011 00:16:56 +0000 Subject: [PATCH 3/5] win32: update .def file for new audiosink API API: gst_base_audio_sink_get_alignment_threshold() API: gst_base_audio_sink_set_alignment_threshold() API: gst_base_audio_sink_get_discont_wait() API: gst_base_audio_sink_set_discont_wait() --- win32/common/libgstaudio.def | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def index 8395b0005f..cc8e3102aa 100644 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@ -77,10 +77,14 @@ EXPORTS gst_audio_src_get_type gst_audio_structure_set_int 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 From 51426a3b2d2b77700de22f75b2091a9f323308ba Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Thu, 27 Oct 2011 14:48:52 +0100 Subject: [PATCH 4/5] textoverlay: continue processing text when silent This prevents playback wegding when text buffers are left to pile up. https://bugzilla.gnome.org/show_bug.cgi?id=662829 --- ext/pango/gsttextoverlay.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index e33ee5a4a3..d57cdf4a2b 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -2542,7 +2542,7 @@ wait_for_text_buf: if (overlay->video_eos) goto have_eos; - if (overlay->silent) { + if (overlay->silent && !overlay->text_linked) { GST_OBJECT_UNLOCK (overlay); ret = gst_pad_push (overlay->srcpad, buffer); @@ -2632,6 +2632,11 @@ wait_for_text_buf: GST_OBJECT_UNLOCK (overlay); /* Push the video frame */ ret = gst_pad_push (overlay->srcpad, buffer); + } else if (overlay->silent) { + GST_LOG_OBJECT (overlay, "silent enabled, pushing video buf"); + GST_OBJECT_UNLOCK (overlay); + /* Push the video frame */ + ret = gst_pad_push (overlay->srcpad, buffer); } else { gchar *in_text; gsize in_size; From 73be2b4b1af0aeb1816bcaf53511fad40d260290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 9 Nov 2011 00:36:51 +0000 Subject: [PATCH 5/5] configure: suppress warnings about unused variables if debugging system is disabled in core https://bugzilla.gnome.org/show_bug.cgi?id=662952 --- common | 2 +- configure.ac | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common b/common index e4a9407a51..63d592ed74 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e4a9407a51803016bab9918b03e2034981886bdb +Subproject commit 63d592ed74618734d69438c770d6462efeb5ab9d diff --git a/configure.ac b/configure.ac index 8284534db9..b2b17f2a86 100644 --- a/configure.ac +++ b/configure.ac @@ -372,20 +372,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)