summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorgb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>2010-04-30 15:37:28 +0000
committerGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2010-09-20 12:55:42 +0200
commita4d201aaf93816fd23ed1eeffae6786cec883020 (patch)
tree48386bf17ea2bbe485a9d7ab21c5be03507ef422 /tests
parent4c7c0307c4f85f1bb5978b2373dcb9747fc9e34d (diff)
Drop excessive threading that over-complicates synchronisation.
MPEG-2 & H.264 videos now play but there are other problems (timestamps).
Diffstat (limited to 'tests')
-rw-r--r--tests/test-decode.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/test-decode.c b/tests/test-decode.c
index 36d07afa..f4b56b92 100644
--- a/tests/test-decode.c
+++ b/tests/test-decode.c
@@ -28,10 +28,6 @@
#include "test-h264.h"
#include "test-vc1.h"
-/* Default timeout to wait for the first decoded frame (10 ms) */
-/* Defined to -1 if the application indefintely waits for the decoded frame */
-#define TIMEOUT -1
-
typedef void (*GetVideoDataFunc)(const guchar **data, guint *size);
typedef struct _CodecDefs CodecDefs;
@@ -123,16 +119,9 @@ main(int argc, char *argv[])
if (!gst_vaapi_decoder_put_buffer(decoder, NULL))
g_error("could not send EOS to the decoder");
- if (TIMEOUT < 0) {
- proxy = gst_vaapi_decoder_get_surface(decoder, &status);
- if (!proxy)
- g_error("could not get decoded surface");
- }
- else {
- proxy = gst_vaapi_decoder_timed_get_surface(decoder, TIMEOUT, &status);
- if (!proxy)
- g_warning("Could not get decoded surface after %d us", TIMEOUT);
- }
+ proxy = gst_vaapi_decoder_get_surface(decoder, &status);
+ if (!proxy)
+ g_error("could not get decoded surface (decoder status %d)", status);
gst_vaapi_window_show(window);