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/common.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/libffmpeg/libavcodec/common.h') diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h index c2305b45e..893b7ed64 100644 --- a/src/libffmpeg/libavcodec/common.h +++ b/src/libffmpeg/libavcodec/common.h @@ -169,7 +169,6 @@ typedef signed long long INT64; # ifndef DEBUG # define NDEBUG # endif -# include /* dprintf macros */ # if defined(CONFIG_WIN32) && !defined(__MINGW32__) @@ -326,7 +325,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) st_out_bit_counts[st_current_index] += n; #endif // printf("put_bits=%d %x\n", n, value); - assert(n == 32 || value < (1U << n)); + XINE_ASSERT((n == 32 || value < (1U << n)), "?"); bit_buf = s->bit_buf; bit_left = s->bit_left; @@ -903,7 +902,7 @@ static inline int ff_sqrt(int a) * converts fourcc string to int */ static inline int ff_get_fourcc(const char *s){ - assert( strlen(s)==4 ); + XINE_ASSERT( strlen(s)==4, "lenght of value 's' != 4: %d", strlen(s) ); return (s[0]) + (s[1]<<8) + (s[2]<<16) + (s[3]<<24); } -- cgit v1.2.3