[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23794 - Extractor/src/plugins
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23794 - Extractor/src/plugins |
Date: |
Fri, 14 Sep 2012 13:50:13 +0200 |
Author: LRN
Date: 2012-09-14 13:50:13 +0200 (Fri, 14 Sep 2012)
New Revision: 23794
Modified:
Extractor/src/plugins/gstreamer_extractor.c
Extractor/src/plugins/test_gstreamer.c
Log:
More verbosity to GStreamer extractor test
Modified: Extractor/src/plugins/gstreamer_extractor.c
===================================================================
--- Extractor/src/plugins/gstreamer_extractor.c 2012-09-14 11:50:09 UTC (rev
23793)
+++ Extractor/src/plugins/gstreamer_extractor.c 2012-09-14 11:50:13 UTC (rev
23794)
@@ -45,7 +45,7 @@
* and kill it.
* In microseconds.
*/
-#define DATA_TIMEOUT 80000 /* 80ms */
+#define DATA_TIMEOUT 80000LL /* 80ms */
/**
* Struct mapping GSTREAMER tags to LE tags.
@@ -1772,6 +1772,8 @@
gint64 now = g_get_monotonic_time ();
if (now - ps->last_data_request_time > DATA_TIMEOUT)
{
+ GST_ERROR ("GstDiscoverer I/O timed out (last heard from discoverer on
%lld, now is %lld, difference is %lld > %lld",
+ ps->last_data_request_time, now, now - ps->last_data_request_time,
DATA_TIMEOUT);
ps->timeout_id = 0;
g_main_loop_quit (ps->loop);
return FALSE;
Modified: Extractor/src/plugins/test_gstreamer.c
===================================================================
--- Extractor/src/plugins/test_gstreamer.c 2012-09-14 11:50:09 UTC (rev
23793)
+++ Extractor/src/plugins/test_gstreamer.c 2012-09-14 11:50:13 UTC (rev
23794)
@@ -135,6 +135,7 @@
pre_test = discoverer_main (dc, "testdata/gstreamer_30_and_33.asf");
if (GST_DISCOVERER_MISSING_PLUGINS != pre_test)
{
+ int test_result;
struct SolutionData thirty_and_thirtythree_sol[] =
{
{
@@ -297,12 +298,16 @@
{ "testdata/30_and_33.asf", thirty_and_thirtythree_sol },
{ NULL, NULL }
};
- result += (0 == ET_main ("gstreamer", ps) ? 0 : 1);
+ g_print ("Running asf test on GStreamer:\n");
+ test_result = (0 == ET_main ("gstreamer", ps) ? 0 : 1);
+ g_print ("asf GStreamer test result: %s\n", test_result == 0 ? "OK" :
"FAILED");
+ result += test_result;
}
pre_test = discoverer_main (dc, "testdata/gstreamer_barsandtone.flv");
if (pre_test != GST_DISCOVERER_MISSING_PLUGINS)
{
+ int test_result;
struct SolutionData barsandtone_sol[] =
{
{
@@ -492,12 +497,16 @@
{ "testdata/barsandtone.flv", barsandtone_sol },
{ NULL, NULL }
};
- result += (0 == ET_main ("gstreamer", ps) ? 0 : 1);
+ g_print ("Running flv test on GStreamer:\n");
+ test_result = (0 == ET_main ("gstreamer", ps) ? 0 : 1);
+ g_print ("flv GStreamer test result: %s\n", test_result == 0 ? "OK" :
"FAILED");
+ result += test_result;
}
pre_test = discoverer_main (dc, "testdata/gstreamer_sample_sorenson.mov");
if (pre_test != GST_DISCOVERER_MISSING_PLUGINS)
{
+ int test_result;
struct SolutionData sample_sorenson_sol[] =
{
{
@@ -692,7 +701,10 @@
{ "testdata/gstreamer_sample_sorenson.mov", sample_sorenson_sol },
{ NULL, NULL }
};
- result += (0 == ET_main ("gstreamer", ps) ? 0 : 1);
+ g_print ("Running mov test on GStreamer:\n");
+ test_result = (0 == ET_main ("gstreamer", ps) ? 0 : 1);
+ g_print ("mov GStreamer test result: %s\n", test_result == 0 ? "OK" :
"FAILED");
+ result += test_result;
}
pre_test = discoverer_main (dc, "testdata/matroska_flame.mkv");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23794 - Extractor/src/plugins,
gnunet <=