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

gst/net/gstnetclientclock.c: Fix compilation, uninitialized vars and a forgotten continue.

Browse source 
Original commit message from CVS:
* gst/net/gstnetclientclock.c: (do_linear_regression),
(gst_net_client_clock_do_select), (gst_net_client_clock_thread):
Fix compilation, uninitialized vars and a forgotten continue.
This commit is contained in:
Wim Taymans 2005-11-17 18:18:41 +00:00
parent d56b83f662
commit 363f1bfd4a
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-11-17 Wim Taymans <wim@fluendo.com>
* gst/net/gstnetclientclock.c: (do_linear_regression),
(gst_net_client_clock_do_select), (gst_net_client_clock_thread):
Fix compilation, uninitialized vars and a forgotten continue.
2005-11-17 Andy Wingo <wingo@pobox.com> 2005-11-17 Andy Wingo <wingo@pobox.com>
* check/Makefile.am (check_PROGRAMS): * check/Makefile.am (check_PROGRAMS):

9
gst/net/gstnetclientclock.c
View file

@ -227,6 +227,8 @@ do_linear_regression (GstClockTime * x, GstClockTime * y, gint n, gdouble * m,
gdouble sxx, syy, sxy, xbar, ybar; gdouble sxx, syy, sxy, xbar, ybar;
gint i; gint i;
sxx = syy = sxy = xbar = ybar = 0.0;
/* we lose precision with the doubles, but there's no other way except to use /* we lose precision with the doubles, but there's no other way except to use
~80 bit arithmetic */ ~80 bit arithmetic */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -307,7 +309,7 @@ bogus_observation:
static gint static gint
gst_net_client_clock_do_select (GstNetClientClock * self, fd_set * readfds) gst_net_client_clock_do_select (GstNetClientClock * self, fd_set * readfds)
{ {
guint max_sock; gint max_sock;
gint ret; gint ret;
while (TRUE) { while (TRUE) {
@ -319,12 +321,12 @@ gst_net_client_clock_do_select (GstNetClientClock * self, fd_set * readfds)
GST_LOG_OBJECT (self, "doing select"); GST_LOG_OBJECT (self, "doing select");
{ {
GstClockTime diff; GstClockTime diff;
GTimeVal tv; GTimeVal tv, *ptv = &tv;
diff = gst_clock_get_internal_time (GST_CLOCK (self)); diff = gst_clock_get_internal_time (GST_CLOCK (self));
GST_TIME_TO_TIMEVAL (self->current_timeout, tv); GST_TIME_TO_TIMEVAL (self->current_timeout, tv);
ret = select (max_sock + 1, readfds, NULL, NULL, (struct timeval *) &tv); ret = select (max_sock + 1, readfds, NULL, NULL, (struct timeval *) ptv);
diff = gst_clock_get_internal_time (GST_CLOCK (self)) - diff; diff = gst_clock_get_internal_time (GST_CLOCK (self)) - diff;
@ -412,6 +414,7 @@ gst_net_client_clock_thread (gpointer data)
/* reset timeout */ /* reset timeout */
self->current_timeout = self->timeout; self->current_timeout = self->timeout;
continue;
} else if (FD_ISSET (READ_SOCKET (self), &read_fds)) { } else if (FD_ISSET (READ_SOCKET (self), &read_fds)) {
/* got data in */ /* got data in */
GstClockTime new_local = gst_clock_get_internal_time (GST_CLOCK (self)); GstClockTime new_local = gst_clock_get_internal_time (GST_CLOCK (self));

9
libs/gst/net/gstnetclientclock.c
View file

@ -227,6 +227,8 @@ do_linear_regression (GstClockTime * x, GstClockTime * y, gint n, gdouble * m,
gdouble sxx, syy, sxy, xbar, ybar; gdouble sxx, syy, sxy, xbar, ybar;
gint i; gint i;
sxx = syy = sxy = xbar = ybar = 0.0;
/* we lose precision with the doubles, but there's no other way except to use /* we lose precision with the doubles, but there's no other way except to use
~80 bit arithmetic */ ~80 bit arithmetic */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -307,7 +309,7 @@ bogus_observation:
static gint static gint
gst_net_client_clock_do_select (GstNetClientClock * self, fd_set * readfds) gst_net_client_clock_do_select (GstNetClientClock * self, fd_set * readfds)
{ {
guint max_sock; gint max_sock;
gint ret; gint ret;
while (TRUE) { while (TRUE) {
@ -319,12 +321,12 @@ gst_net_client_clock_do_select (GstNetClientClock * self, fd_set * readfds)
GST_LOG_OBJECT (self, "doing select"); GST_LOG_OBJECT (self, "doing select");
{ {
GstClockTime diff; GstClockTime diff;
GTimeVal tv; GTimeVal tv, *ptv = &tv;
diff = gst_clock_get_internal_time (GST_CLOCK (self)); diff = gst_clock_get_internal_time (GST_CLOCK (self));
GST_TIME_TO_TIMEVAL (self->current_timeout, tv); GST_TIME_TO_TIMEVAL (self->current_timeout, tv);
ret = select (max_sock + 1, readfds, NULL, NULL, (struct timeval *) &tv); ret = select (max_sock + 1, readfds, NULL, NULL, (struct timeval *) ptv);
diff = gst_clock_get_internal_time (GST_CLOCK (self)) - diff; diff = gst_clock_get_internal_time (GST_CLOCK (self)) - diff;
@ -412,6 +414,7 @@ gst_net_client_clock_thread (gpointer data)
/* reset timeout */ /* reset timeout */
self->current_timeout = self->timeout; self->current_timeout = self->timeout;
continue;
} else if (FD_ISSET (READ_SOCKET (self), &read_fds)) { } else if (FD_ISSET (READ_SOCKET (self), &read_fds)) {
/* got data in */ /* got data in */
GstClockTime new_local = gst_clock_get_internal_time (GST_CLOCK (self)); GstClockTime new_local = gst_clock_get_internal_time (GST_CLOCK (self));