[gst-cvs] dolphy gst-plugins-base: gst-plugins-base/ gst-plugins-base/ext/pango/

[<do...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     dolphy
Date:           Sat Feb 18 2006  11:54:00 PST

Log message:
2006-02-18  Julien MOUTTE  <ju...@mo...>
        * ext/pango/gstclockoverlay.c: (gst_clock_overlay_get_text):
        * ext/pango/gsttimeoverlay.c: (gst_time_overlay_get_text): Those
        functions are called with lock held.

Modified files:
    .               : ChangeLog
    ext/pango       : gstclockoverlay.c gsttimeoverlay.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2396&r2=1.2397
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/pango/gstclockoverlay.c.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/pango/gsttimeoverlay.c.diff?r1=1.17&r2=1.18

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.2396
retrieving revision 1.2397
diff -u -d -r1.2396 -r1.2397
--- ChangeLog	18 Feb 2006 19:51:47 -0000	1.2396
+++ ChangeLog	18 Feb 2006 19:53:48 -0000	1.2397
@@ -1,5 +1,11 @@
 2006-02-18  Julien MOUTTE  <ju...@mo...>
 
+	* ext/pango/gstclockoverlay.c: (gst_clock_overlay_get_text): 
+	* ext/pango/gsttimeoverlay.c: (gst_time_overlay_get_text): Those
+	functions are called with lock held.
+
+2006-02-18  Julien MOUTTE  <ju...@mo...>
 	* ext/pango/gsttextoverlay.c: (gst_text_overlay_base_init),
 	(gst_text_overlay_finalize), (gst_text_overlay_init),
 	(gst_text_overlay_setcaps), (gst_text_overlay_src_event),
Index: gstclockoverlay.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/pango/gstclockoverlay.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gstclockoverlay.c	2 Dec 2005 16:52:54 -0000	1.3
+++ gstclockoverlay.c	18 Feb 2006 19:53:48 -0000	1.4
@@ -86,6 +86,7 @@
   return g_strdup_printf ("%02u:%02u:%02u", t.tm_hour, t.tm_min, t.tm_sec);
 }
+/* Called with lock held */
 static gchar *
 gst_clock_overlay_get_text (GstTextOverlay * overlay, GstBuffer * video_frame)
 {
@@ -93,9 +94,7 @@
   overlay->need_render = TRUE;
-  GST_OBJECT_LOCK (overlay);
   txt = g_strdup (overlay->default_text);
-  GST_OBJECT_UNLOCK (overlay);
   time_str = gst_clock_overlay_render_time (GST_CLOCK_OVERLAY (overlay));
   if (txt != NULL && *txt != '\0') {
Index: gsttimeoverlay.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/pango/gsttimeoverlay.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gsttimeoverlay.c	2 Dec 2005 16:52:54 -0000	1.17
+++ gsttimeoverlay.c	18 Feb 2006 19:53:48 -0000	1.18
@@ -89,6 +89,7 @@
   return g_strdup_printf ("%u:%02u:%02u.%03u", hours, mins, secs, msecs);
 gst_time_overlay_get_text (GstTextOverlay * overlay, GstBuffer * video_frame)
@@ -104,9 +105,7 @@
   GST_DEBUG ("buffer with timestamp %" GST_TIME_FORMAT, GST_TIME_ARGS (time));
   time_str = gst_time_overlay_render_time (GST_TIME_OVERLAY (overlay), time);