[FFmpeg-cvslog] r18387 - trunk/libavutil/lzo.c

[diego]

Author: diego
Date: Thu Apr  9 17:11:48 2009
New Revision: 18387

Log:
Give liblzo benchmark conditionals more descriptive names and add convenience
definitions along with instructions for changing them.

Modified:
   trunk/libavutil/lzo.c

Modified: trunk/libavutil/lzo.c
==============================================================================
--- trunk/libavutil/lzo.c	Thu Apr  9 16:55:05 2009	(r18386)
+++ trunk/libavutil/lzo.c	Thu Apr  9 17:11:48 2009	(r18387)
@@ -239,6 +239,12 @@ int av_lzo1x_decode(void *out, int *outl
 #include <lzo/lzo1x.h>
 #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))