From 985fdd534f29e5c0e05e47216bb2ae9b8c353895 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 9 Apr 2009 15:11:48 +0000 Subject: [PATCH] Give liblzo benchmark conditionals more descriptive names and add convenience definitions along with instructions for changing them. Originally committed as revision 18387 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/lzo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavutil/lzo.c b/libavutil/lzo.c index 668c084515..a876fc7776 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -239,6 +239,12 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { #include #include "log.h" #define MAXSZ (10*1024*1024) + +/* Define one of these to 1 if you wish to benchmark liblzo + * instead of our native implementation. */ +#define BENCHMARK_LIBLZO_SAFE 0 +#define BENCHMARK_LIBLZO_UNSAFE 0 + int main(int argc, char *argv[]) { FILE *in = fopen(argv[1], "rb"); uint8_t *orig = av_malloc(MAXSZ + 16); @@ -254,9 +260,9 @@ int main(int argc, char *argv[]) { for (i = 0; i < 300; i++) { START_TIMER inlen = clen; outlen = MAXSZ; -#ifdef LIBLZO +#if BENCHMARK_LIBLZO_SAFE if (lzo1x_decompress_safe(comp, inlen, decomp, &outlen, NULL)) -#elif defined(LIBLZO_UNSAFE) +#elif BENCHMARK_LIBLZO_UNSAFE if (lzo1x_decompress(comp, inlen, decomp, &outlen, NULL)) #else if (av_lzo1x_decode(decomp, &outlen, comp, &inlen))