[FFmpeg-cvslog] r15200 - in trunk/vhook: fish.c imlib2.c null.c

[stefano]

Author: stefano
Date: Thu Sep  4 22:45:13 2008
New Revision: 15200

Log:
Properly use av_log rather than fprintf/printf.
Fix the "implicit declaration of function 'please_use_av_log'" warnings.
Patch by JonY <10walls _AT_ gmail #dot# com>


Modified:
   trunk/vhook/fish.c
   trunk/vhook/imlib2.c
   trunk/vhook/null.c

Modified: trunk/vhook/fish.c
==============================================================================
--- trunk/vhook/fish.c	(original)
+++ trunk/vhook/fish.c	Thu Sep  4 22:45:13 2008
@@ -155,7 +155,7 @@ int Configure(void **ctxp, int argc, cha
             case 't':
                 ci->threshold = atof(optarg) * 1000;
                 if (ci->threshold > 1000 || ci->threshold < 0) {
-                    fprintf(stderr, "Invalid threshold value '%s' (range is 0-1)\n", optarg);
+                    av_log(NULL, AV_LOG_ERROR, "Invalid threshold value '%s' (range is 0-1)\n", optarg);
                     return -1;
                 }
                 break;
@@ -169,20 +169,20 @@ int Configure(void **ctxp, int argc, cha
                 ci->dir = av_strdup(optarg);
                 break;
             default:
-                fprintf(stderr, "Unrecognized argument '%s'\n", argv[optind]);
+                av_log(NULL, AV_LOG_ERROR, "Unrecognized argument '%s'\n", argv[optind]);
                 return -1;
         }
     }
 
-    fprintf(stderr, "Fish detector configured:\n");
-    fprintf(stderr, "    HSV range: %d,%d,%d - %d,%d,%d\n",
+    av_log(NULL, AV_LOG_INFO, "Fish detector configured:\n");
+    av_log(NULL, AV_LOG_INFO, "    HSV range: %d,%d,%d - %d,%d,%d\n",
                         ci->dark.h,
                         ci->dark.s,
                         ci->dark.v,
                         ci->bright.h,
                         ci->bright.s,
                         ci->bright.v);
-    fprintf(stderr, "    Threshold is %d%% pixels\n", ci->threshold / 10);
+    av_log(NULL, AV_LOG_INFO, "    Threshold is %d%% pixels\n", ci->threshold / 10);
 
 
     return 0;
@@ -234,7 +234,7 @@ void Process(void *ctx, AVPicture *pictu
     int rowsize = picture->linesize[0];
 
 #if 0
-    printf("pix_fmt = %d, width = %d, pts = %lld, ci->next_pts = %lld\n",
+    av_log(NULL, AV_LOG_DEBUG, "pix_fmt = %d, width = %d, pts = %lld, ci->next_pts = %lld\n",
         pix_fmt, width, pts, ci->next_pts);
 #endif
 
@@ -281,7 +281,7 @@ void Process(void *ctx, AVPicture *pictu
                 get_hsv(&hsv, r, g, b);
 
                 if (ci->debug > 1)
-                    fprintf(stderr, "(%d,%d,%d) -> (%d,%d,%d)\n",
+                    av_log(NULL, AV_LOG_DEBUG, "(%d,%d,%d) -> (%d,%d,%d)\n",
                         r,g,b,hsv.h,hsv.s,hsv.v);
 
 
@@ -306,7 +306,7 @@ void Process(void *ctx, AVPicture *pictu
         }
 
         if (ci->debug)
-            fprintf(stderr, "Fish: Inrange=%d of %d = %d threshold\n", inrange, pixcnt, 1000 * inrange / pixcnt);
+            av_log(NULL, AV_LOG_INFO, "Fish: Inrange=%d of %d = %d threshold\n", inrange, pixcnt, 1000 * inrange / pixcnt);
 
         if (inrange * 1000 / pixcnt >= ci->threshold) {
             /* Save to file */

Modified: trunk/vhook/imlib2.c
==============================================================================
--- trunk/vhook/imlib2.c	(original)
+++ trunk/vhook/imlib2.c	Thu Sep  4 22:45:13 2008
@@ -215,21 +215,21 @@ int Configure(void **ctxp, int argc, cha
                 ci->fileImage = av_strdup(optarg);
                 break;
             case '?':
-                fprintf(stderr, "Unrecognized argument '%s'\n", argv[optind]);
+                av_log(NULL, AV_LOG_ERROR, "Unrecognized argument '%s'\n", argv[optind]);
                 return -1;
         }
     }
 
     if (ci->eval_colors && !(ci->expr_R && ci->expr_G && ci->expr_B))
     {
-        fprintf(stderr, "You must specify expressions for all or no colors.\n");
+        av_log(NULL, AV_LOG_ERROR, "You must specify expressions for all or no colors.\n");
         return -1;
     }
 
     if (ci->text || ci->file) {
         ci->fn = imlib_load_font(font);
         if (!ci->fn) {
-            fprintf(stderr, "Failed to load font '%s'\n", font);
+            av_log(NULL, AV_LOG_ERROR, "Failed to load font '%s'\n", font);
             return -1;
         }
         imlib_context_set_font(ci->fn);
@@ -242,7 +242,7 @@ int Configure(void **ctxp, int argc, cha
 
         if (ci->eval_colors)
         {
-            fprintf(stderr, "You must not specify both a color name and expressions for the colors.\n");
+            av_log(NULL, AV_LOG_ERROR, "You must not specify both a color name and expressions for the colors.\n");
             return -1;
         }
 
@@ -255,7 +255,7 @@ int Configure(void **ctxp, int argc, cha
                 f = fopen("/usr/lib/X11/rgb.txt", "r");
         }
         if (!f) {
-            fprintf(stderr, "Failed to find RGB color names file\n");
+            av_log(NULL, AV_LOG_ERROR, "Failed to find RGB color names file\n");
             return -1;
         }
         while (fgets(buff, sizeof(buff), f)) {
@@ -274,7 +274,7 @@ int Configure(void **ctxp, int argc, cha
         }
         fclose(f);
         if (!done) {
-            fprintf(stderr, "Unable to find color '%s' in rgb.txt\n", color);
+            av_log(NULL, AV_LOG_ERROR, "Unable to find color '%s' in rgb.txt\n", color);
             return -1;
         }
     } else if (ci->eval_colors) {

Modified: trunk/vhook/null.c
==============================================================================
--- trunk/vhook/null.c	(original)
+++ trunk/vhook/null.c	Thu Sep  4 22:45:13 2008
@@ -50,7 +50,7 @@ void Release(void *ctx)
 
 int Configure(void **ctxp, int argc, char *argv[])
 {
-    fprintf(stderr, "Called with argc=%d\n", argc);
+    av_log(NULL, AV_LOG_DEBUG, "Called with argc=%d\n", argc);
 
     *ctxp = av_mallocz(sizeof(ContextInfo));
     return 0;