mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-28 14:52:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/net/gstnetclientclock.c: Turn off debugging.

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

* gst/net/gstnetclientclock.c: Turn off debugging.

* check/net/gstnetclientclock.c (test_functioning): Assert that the
times connverge somewhat. Can't make a real test.
This commit is contained in:
Andy Wingo 2005-11-18 15:52:24 +00:00
parent fa09daa3d2
commit a1ac7b668a
5 changed files with 55 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2005-11-18 Andy Wingo <wingo@pobox.com>
* gst/net/gstnetclientclock.c: Turn off debugging.
* check/net/gstnetclientclock.c (test_functioning): Assert that the
times connverge somewhat. Can't make a real test.
* gst/net/gstnetclientclock.c (do_linear_regression): Use all
integer arithmetic. Return the minimum of the domain, which can be
set as "internal" for gst_clock_set_calibration.

29
check/net/gstnetclientclock.c
View file

@ -51,7 +51,7 @@ GST_START_TEST (test_functioning)
GstNetTimeProvider *ntp;
GstClock *client, *server;
GstClockTime basex, basey;
GstClockTime servint; //, servtime, localtime;
GstClockTime servtime, clienttime;
gint port;
gdouble rate;
@ -62,21 +62,40 @@ GST_START_TEST (test_functioning)
gst_clock_get_calibration (server, &basex, &basey, &rate);
basey += 100 * GST_SECOND;
gst_clock_set_calibration (server, basex, basey, rate);
servint = gst_clock_get_internal_time (GST_CLOCK (server));
ntp = gst_net_time_provider_new (server, "127.0.0.1", 0);
fail_unless (ntp != NULL, "failed to create network time provider");
g_object_get (ntp, "port", &port, NULL);
/* g_print ("server port: %d\n", port); */
client = gst_net_client_clock_new (NULL, "127.0.0.1", port, GST_SECOND);
fail_unless (client != NULL, "failed to get network client clock");
g_object_get (client, "port", &port, NULL);
/* g_print ("client connecting to server port %d\n", port); */
g_usleep (G_USEC_PER_SEC * 60);
/* let the clocks synchronize */
g_usleep (G_USEC_PER_SEC / 2);
servtime = gst_clock_get_time (server);
clienttime = gst_clock_get_time (client);
/* can't in general make a precise assertion here, because this depends on
* system load and a lot of things. however within half a second they should
* at least be within 1/10 of a second of each other... */
if (servtime > clienttime)
fail_unless (servtime - clienttime < 100 * GST_MSECOND,
"clocks not in sync (%" GST_TIME_FORMAT ")",
GST_TIME_ARGS (servtime - clienttime));
else
fail_unless (clienttime - servtime < 100 * GST_MSECOND,
"clocks not in sync (%" GST_TIME_FORMAT ")",
GST_TIME_ARGS (clienttime - servtime));
/*
g_print ("diff: %" GST_TIME_FORMAT,
GST_TIME_ARGS (servtime > clienttime ? servtime - clienttime
: clienttime - servtime));
*/
/* one for gstreamer, one for ntp, one for us */
ASSERT_OBJECT_REFCOUNT (server, "system clock", 3);

2
gst/net/gstnetclientclock.c
View file

@ -34,7 +34,7 @@
GST_DEBUG_CATEGORY (ncc_debug);
#define GST_CAT_DEFAULT (ncc_debug)
#define DEBUGGING_ENABLED
/* #define DEBUGGING_ENABLED */
#ifdef DEBUGGING_ENABLED
#define DEBUG(x, args...) g_print (x "\n", ##args)

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

@ -34,7 +34,7 @@
GST_DEBUG_CATEGORY (ncc_debug);
#define GST_CAT_DEFAULT (ncc_debug)
#define DEBUGGING_ENABLED
/* #define DEBUGGING_ENABLED */
#ifdef DEBUGGING_ENABLED
#define DEBUG(x, args...) g_print (x "\n", ##args)

29
tests/check/libs/gstnetclientclock.c
View file

@ -51,7 +51,7 @@ GST_START_TEST (test_functioning)
GstNetTimeProvider *ntp;
GstClock *client, *server;
GstClockTime basex, basey;
GstClockTime servint; //, servtime, localtime;
GstClockTime servtime, clienttime;
gint port;
gdouble rate;
@ -62,21 +62,40 @@ GST_START_TEST (test_functioning)
gst_clock_get_calibration (server, &basex, &basey, &rate);
basey += 100 * GST_SECOND;
gst_clock_set_calibration (server, basex, basey, rate);
servint = gst_clock_get_internal_time (GST_CLOCK (server));
ntp = gst_net_time_provider_new (server, "127.0.0.1", 0);
fail_unless (ntp != NULL, "failed to create network time provider");
g_object_get (ntp, "port", &port, NULL);
/* g_print ("server port: %d\n", port); */
client = gst_net_client_clock_new (NULL, "127.0.0.1", port, GST_SECOND);
fail_unless (client != NULL, "failed to get network client clock");
g_object_get (client, "port", &port, NULL);
/* g_print ("client connecting to server port %d\n", port); */
g_usleep (G_USEC_PER_SEC * 60);
/* let the clocks synchronize */
g_usleep (G_USEC_PER_SEC / 2);
servtime = gst_clock_get_time (server);
clienttime = gst_clock_get_time (client);
/* can't in general make a precise assertion here, because this depends on
* system load and a lot of things. however within half a second they should
* at least be within 1/10 of a second of each other... */
if (servtime > clienttime)
fail_unless (servtime - clienttime < 100 * GST_MSECOND,
"clocks not in sync (%" GST_TIME_FORMAT ")",
GST_TIME_ARGS (servtime - clienttime));
else
fail_unless (clienttime - servtime < 100 * GST_MSECOND,
"clocks not in sync (%" GST_TIME_FORMAT ")",
GST_TIME_ARGS (clienttime - servtime));
/*
g_print ("diff: %" GST_TIME_FORMAT,
GST_TIME_ARGS (servtime > clienttime ? servtime - clienttime
: clienttime - servtime));
*/
/* one for gstreamer, one for ntp, one for us */
ASSERT_OBJECT_REFCOUNT (server, "system clock", 3);