mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:46:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/elements/gstfakesrc.c (gst_fake_src_create): It's not an error if the user selected "no clock" as the clocking me...

Browse source 
Original commit message from CVS:
2005-11-15  Andy Wingo  <wingo@pobox.com>

* gst/elements/gstfakesrc.c (gst_fake_src_create): It's not an
error if the user selected "no clock" as the clocking method.
This commit is contained in:
Andy Wingo 2005-11-15 12:35:45 +00:00
parent 58a5b2f5fa
commit 7688db602f
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2005-11-15 Andy Wingo <wingo@pobox.com> 2005-11-15 Andy Wingo <wingo@pobox.com>
* gst/elements/gstfakesrc.c (gst_fake_src_create): It's not an
error if the user selected "no clock" as the clocking method.
* check/gst/gstpipeline.c (test_base_time): New test for buffer * check/gst/gstpipeline.c (test_base_time): New test for buffer
timestamps with live capture. timestamps with live capture.

13
gst/elements/gstfakesrc.c
View file

@ -704,12 +704,15 @@ gst_fake_src_create (GstBaseSrc * basesrc, guint64 offset, guint length,
GstClock *clock; GstClock *clock;
clock = gst_element_get_clock (GST_ELEMENT (src)); clock = gst_element_get_clock (GST_ELEMENT (src));
g_return_val_if_fail (clock != NULL, GST_FLOW_ERROR);
time = gst_clock_get_time (clock); if (clock) {
time -= gst_element_get_base_time (GST_ELEMENT (src)); time = gst_clock_get_time (clock);
time -= gst_element_get_base_time (GST_ELEMENT (src));
gst_object_unref (clock); gst_object_unref (clock);
} else {
/* not an error not to have a clock */
time = GST_CLOCK_TIME_NONE;
}
} else { } else {
time = GST_CLOCK_TIME_NONE; time = GST_CLOCK_TIME_NONE;
} }

13
plugins/elements/gstfakesrc.c
View file

@ -704,12 +704,15 @@ gst_fake_src_create (GstBaseSrc * basesrc, guint64 offset, guint length,
GstClock *clock; GstClock *clock;
clock = gst_element_get_clock (GST_ELEMENT (src)); clock = gst_element_get_clock (GST_ELEMENT (src));
g_return_val_if_fail (clock != NULL, GST_FLOW_ERROR);
time = gst_clock_get_time (clock); if (clock) {
time -= gst_element_get_base_time (GST_ELEMENT (src)); time = gst_clock_get_time (clock);
time -= gst_element_get_base_time (GST_ELEMENT (src));
gst_object_unref (clock); gst_object_unref (clock);
} else {
/* not an error not to have a clock */
time = GST_CLOCK_TIME_NONE;
}
} else { } else {
time = GST_CLOCK_TIME_NONE; time = GST_CLOCK_TIME_NONE;
} }