diff options
Diffstat (limited to 'src/libXvMC/tests/test_blocks.c')
| -rw-r--r-- | src/libXvMC/tests/test_blocks.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/libXvMC/tests/test_blocks.c b/src/libXvMC/tests/test_blocks.c index 0b895ee7737..dc80adfa652 100644 --- a/src/libXvMC/tests/test_blocks.c +++ b/src/libXvMC/tests/test_blocks.c @@ -7,7 +7,7 @@ int main(int argc, char **argv) const unsigned int width = 16, height = 16; const unsigned int min_required_blocks = 1, min_required_macroblocks = 1; const unsigned int mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2}; - + Display *display; XvPortID port_num; int surface_type_id; @@ -17,9 +17,9 @@ int main(int argc, char **argv) XvMCSurface surface; XvMCBlockArray blocks = {0}; XvMCMacroBlockArray macroblocks = {0}; - + display = XOpenDisplay(NULL); - + if (!GetPort ( display, @@ -37,25 +37,20 @@ int main(int argc, char **argv) XCloseDisplay(display); error(1, 0, "Error, unable to find a good port.\n"); } - + if (is_overlay) { Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0); XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey); } - + assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success); assert(XvMCCreateSurface(display, &context, &surface) == Success); - + /* Test NULL context */ assert(XvMCCreateBlocks(display, NULL, 1, &blocks) == XvMCBadContext); /* Test 0 blocks */ assert(XvMCCreateBlocks(display, &context, 0, &blocks) == BadValue); - /* Test too many blocks */ - /*assert(XvMCCreateBlocks(display, &context, 16384, &blocks) == BadAlloc);*/ - - /* Note: No XvMCBadBlock(s) error in spec */ - /* Test valid params */ assert(XvMCCreateBlocks(display, &context, min_required_blocks, &blocks) == Success); /* Test context id assigned and correct */ @@ -68,11 +63,6 @@ int main(int argc, char **argv) assert(XvMCCreateMacroBlocks(display, NULL, 1, ¯oblocks) == XvMCBadContext); /* Test 0 macroblocks */ assert(XvMCCreateMacroBlocks(display, &context, 0, ¯oblocks) == BadValue); - /* Test too many macroblocks */ - /*assert(XvMCCreateMacroBlocks(display, &context, 16384, ¯oblocks) == BadAlloc);*/ - - /* Note: No XvMCBadMacroBlock(s) error in spec */ - /* Test valid params */ assert(XvMCCreateMacroBlocks(display, &context, min_required_macroblocks, ¯oblocks) == Success); /* Test context id assigned and correct */ @@ -83,13 +73,12 @@ int main(int argc, char **argv) assert(XvMCDestroyMacroBlocks(display, ¯oblocks) == Success); /* Test valid params */ assert(XvMCDestroyBlocks(display, &blocks) == Success); - + assert(XvMCDestroySurface(display, &surface) == Success); assert(XvMCDestroyContext(display, &context) == Success); - + XvUngrabPort(display, port_num, CurrentTime); XCloseDisplay(display); - + return 0; } - |