From 49327f43ca2196122a60314e67eeee929efea873 Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Fri, 28 Feb 2003 02:51:47 +0000 Subject: Xine assert() replacement: All assert() function calls, with exceptions of libdvdread and libdvdnav, have been replaced with XINE_ASSERT. Functionally XINE_ASSERT behaves just likes its predecesor but its adding the ability to print out a stack trace at the point where the assertion fails. So here are a few examples. assert (0); This use of assert was found in a couple locations most favorably being the default case of a switch statement. This was the only thing there. So if the switch statement was unable to find a match it would have defaulted to this and the user and the developers would be stuck wonder who died and where. So it has been replaced with XINE_ASSERT(0, "We have reach this point and don't have a default case"); It may seem a bit none descriptive but there is more going on behind the scene. In addition to checking a condition is true/false, in this case '0', the XINE_ASSERT prints out: :: - assertion '' failed. An example of this might be: input_dvd.c:open_plugin:1178 - assertion '0' failed. xine_malloc failed!!! You have run out of memory XINE_ASSERT and its helper function, print_trace, are found in src/xine-utils/xineutils.h CVS patchset: 4301 CVS date: 2003/02/28 02:51:47 --- src/libffmpeg/libavcodec/mlib/dsputil_mlib.c | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/libffmpeg/libavcodec/mlib') diff --git a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c index b951cd455..14e001316 100644 --- a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c +++ b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c @@ -19,6 +19,7 @@ #include "../dsputil.h" #include "../mpegvideo.h" +#include "xineutils.h" #include #include @@ -31,7 +32,7 @@ static void put_pixels16_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoCopyRef_U8_U8_16x16(dest, (uint8_t *)ref, stride); else @@ -41,7 +42,7 @@ static void put_pixels16_mlib (uint8_t * dest, const uint8_t * ref, static void put_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpX_U8_U8_16x16(dest, (uint8_t *)ref, stride, stride); else @@ -51,7 +52,7 @@ static void put_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref, static void put_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpY_U8_U8_16x16(dest, (uint8_t *)ref, stride, stride); else @@ -61,7 +62,7 @@ static void put_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref, static void put_pixels16_xy2_mlib(uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpXY_U8_U8_16x16(dest, (uint8_t *)ref, stride, stride); else @@ -74,7 +75,7 @@ static void put_pixels16_xy2_mlib(uint8_t * dest, const uint8_t * ref, static void put_pixels8_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoCopyRef_U8_U8_8x16(dest, (uint8_t *)ref, stride); else @@ -84,7 +85,7 @@ static void put_pixels8_mlib (uint8_t * dest, const uint8_t * ref, static void put_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpX_U8_U8_8x16(dest, (uint8_t *)ref, stride, stride); else @@ -94,7 +95,7 @@ static void put_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref, static void put_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpY_U8_U8_8x16(dest, (uint8_t *)ref, stride, stride); else @@ -104,7 +105,7 @@ static void put_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref, static void put_pixels8_xy2_mlib(uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpXY_U8_U8_8x16(dest, (uint8_t *)ref, stride, stride); else @@ -117,7 +118,7 @@ static void put_pixels8_xy2_mlib(uint8_t * dest, const uint8_t * ref, static void avg_pixels16_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoCopyRefAve_U8_U8_16x16(dest, (uint8_t *)ref, stride); else @@ -127,7 +128,7 @@ static void avg_pixels16_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpAveX_U8_U8_16x16(dest, (uint8_t *)ref, stride, stride); else @@ -137,7 +138,7 @@ static void avg_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpAveY_U8_U8_16x16(dest, (uint8_t *)ref, stride, stride); else @@ -147,7 +148,7 @@ static void avg_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels16_xy2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpAveXY_U8_U8_16x16(dest, (uint8_t *)ref, stride, stride); else @@ -160,7 +161,7 @@ static void avg_pixels16_xy2_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels8_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoCopyRefAve_U8_U8_8x16(dest, (uint8_t *)ref, stride); else @@ -170,7 +171,7 @@ static void avg_pixels8_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpAveX_U8_U8_8x16(dest, (uint8_t *)ref, stride, stride); else @@ -180,7 +181,7 @@ static void avg_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpAveY_U8_U8_8x16(dest, (uint8_t *)ref, stride, stride); else @@ -190,7 +191,7 @@ static void avg_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref, static void avg_pixels8_xy2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { - assert(height == 16 || height == 8); + XINE_ASSERT((height == 16 || height == 8),"value 'height' is not equal to 8 or 16: %d", height); if (height == 16) mlib_VideoInterpAveXY_U8_U8_8x16(dest, (uint8_t *)ref, stride, stride); else -- cgit v1.2.3