mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 13:36:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

textoverlay: Put the video segment into the instance struct instead of allocating it separately

Browse source
This commit is contained in:
Sebastian Dröge 2009-11-06 09:01:34 +01:00
parent 8692174b50
commit d941a9f6a6
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ext/pango/gsttextoverlay.c
View file

@ -489,11 +489,6 @@ gst_text_overlay_finalize (GObject * object)
overlay->layout = NULL; overlay->layout = NULL;
} }
if (overlay->segment) {
gst_segment_free (overlay->segment);
overlay->segment = NULL;
}
if (overlay->text_buffer) { if (overlay->text_buffer) {
gst_buffer_unref (overlay->text_buffer); gst_buffer_unref (overlay->text_buffer);
overlay->text_buffer = NULL; overlay->text_buffer = NULL;
@ -592,13 +587,7 @@ gst_text_overlay_init (GstTextOverlay * overlay, GstTextOverlayClass * klass)
overlay->text_buffer = NULL; overlay->text_buffer = NULL;
overlay->text_linked = FALSE; overlay->text_linked = FALSE;
overlay->cond = g_cond_new (); overlay->cond = g_cond_new ();
overlay->segment = gst_segment_new (); gst_segment_init (&overlay->segment, GST_FORMAT_TIME);
if (overlay->segment) {
gst_segment_init (overlay->segment, GST_FORMAT_TIME);
} else {
GST_WARNING_OBJECT (overlay, "segment creation failed");
g_assert_not_reached ();
}
} }
static void static void
@ -1807,9 +1796,9 @@ gst_text_overlay_video_event (GstPad * pad, GstEvent * event)
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
GST_DEBUG_OBJECT (overlay, "VIDEO SEGMENT now: %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (overlay, "VIDEO SEGMENT now: %" GST_SEGMENT_FORMAT,
overlay->segment); &overlay->segment);
gst_segment_set_newsegment (overlay->segment, update, rate, format, gst_segment_set_newsegment (&overlay->segment, update, rate, format,
start, stop, time); start, stop, time);
} else { } else {
GST_ELEMENT_WARNING (overlay, STREAM, MUX, (NULL), GST_ELEMENT_WARNING (overlay, STREAM, MUX, (NULL),
@ -1909,7 +1898,7 @@ gst_text_overlay_text_chain (GstPad * pad, GstBuffer * buffer)
} }
GST_LOG_OBJECT (overlay, "%" GST_SEGMENT_FORMAT " BUFFER: ts=%" GST_LOG_OBJECT (overlay, "%" GST_SEGMENT_FORMAT " BUFFER: ts=%"
GST_TIME_FORMAT ", end=%" GST_TIME_FORMAT, overlay->segment, GST_TIME_FORMAT ", end=%" GST_TIME_FORMAT, &overlay->segment,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer) + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer) +
GST_BUFFER_DURATION (buffer))); GST_BUFFER_DURATION (buffer)));
@ -1922,7 +1911,7 @@ gst_text_overlay_text_chain (GstPad * pad, GstBuffer * buffer)
else else
stop = GST_CLOCK_TIME_NONE; stop = GST_CLOCK_TIME_NONE;
in_seg = gst_segment_clip (overlay->segment, GST_FORMAT_TIME, in_seg = gst_segment_clip (&overlay->segment, GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (buffer), stop, &clip_start, &clip_stop); GST_BUFFER_TIMESTAMP (buffer), stop, &clip_start, &clip_stop);
} else { } else {
in_seg = TRUE; in_seg = TRUE;
@ -1988,15 +1977,15 @@ gst_text_overlay_video_chain (GstPad * pad, GstBuffer * buffer)
} }
GST_LOG_OBJECT (overlay, "%" GST_SEGMENT_FORMAT " BUFFER: ts=%" GST_LOG_OBJECT (overlay, "%" GST_SEGMENT_FORMAT " BUFFER: ts=%"
GST_TIME_FORMAT ", end=%" GST_TIME_FORMAT, overlay->segment, GST_TIME_FORMAT ", end=%" GST_TIME_FORMAT, &overlay->segment,
GST_TIME_ARGS (start), GST_TIME_ARGS (stop)); GST_TIME_ARGS (start), GST_TIME_ARGS (stop));
/* segment_clip() will adjust start unconditionally to segment_start if /* segment_clip() will adjust start unconditionally to segment_start if
* no stop time is provided, so handle this ourselves */ * no stop time is provided, so handle this ourselves */
if (stop == GST_CLOCK_TIME_NONE && start < overlay->segment->start) if (stop == GST_CLOCK_TIME_NONE && start < overlay->segment.start)
goto out_of_segment; goto out_of_segment;
in_seg = gst_segment_clip (overlay->segment, GST_FORMAT_TIME, start, stop, in_seg = gst_segment_clip (&overlay->segment, GST_FORMAT_TIME, start, stop,
&clip_start, &clip_stop); &clip_start, &clip_stop);
if (!in_seg) if (!in_seg)
@ -2043,7 +2032,7 @@ wait_for_text_buf:
ret = gst_pad_push (overlay->srcpad, buffer); ret = gst_pad_push (overlay->srcpad, buffer);
/* Update last_stop */ /* Update last_stop */
gst_segment_set_last_stop (overlay->segment, GST_FORMAT_TIME, clip_start); gst_segment_set_last_stop (&overlay->segment, GST_FORMAT_TIME, clip_start);
return ret; return ret;
} }
@ -2197,7 +2186,7 @@ wait_for_text_buf:
g_free (text); g_free (text);
/* Update last_stop */ /* Update last_stop */
gst_segment_set_last_stop (overlay->segment, GST_FORMAT_TIME, clip_start); gst_segment_set_last_stop (&overlay->segment, GST_FORMAT_TIME, clip_start);
return ret; return ret;

2
ext/pango/gsttextoverlay.h
View file

@ -92,7 +92,7 @@ struct _GstTextOverlay {
GstPad *text_sinkpad; GstPad *text_sinkpad;
GstPad *srcpad; GstPad *srcpad;
GstSegment *segment; GstSegment segment;
GstSegment text_segment; GstSegment text_segment;
GstBuffer *text_buffer; GstBuffer *text_buffer;
gboolean text_linked; gboolean text_linked;