extend log line buffer sizes

[ffmpeg] / libavutil / log.c

diff --git a/libavutil/log.c b/libavutil/log.c
index 62394ea5072811adc777b8c5a8b366424b9e6632..f2272fb64843e43ed05d99e00cdf439c2397eca2 100644 (file)
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -29,6 +29,8 @@
 #include "avutil.h"
 #include "log.h"
 
+#define LINE_SZ 1024
+
 static int av_log_level = AV_LOG_INFO;
 static int flags;
 
@@ -43,12 +45,12 @@ static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
     [AV_LOG_VERBOSE/8] = 10,
     [AV_LOG_DEBUG  /8] = 10,
     [16+AV_CLASS_CATEGORY_NA              ] =  7,
-    [16+AV_CLASS_CATEGORY_INPUT           ] =  3,
-    [16+AV_CLASS_CATEGORY_OUTPUT          ] = 11,
-    [16+AV_CLASS_CATEGORY_MUXER           ] =  3,
-    [16+AV_CLASS_CATEGORY_DEMUXER         ] = 11,
-    [16+AV_CLASS_CATEGORY_ENCODER         ] =  5,
-    [16+AV_CLASS_CATEGORY_DECODER         ] = 13,
+    [16+AV_CLASS_CATEGORY_INPUT           ] = 13,
+    [16+AV_CLASS_CATEGORY_OUTPUT          ] =  5,
+    [16+AV_CLASS_CATEGORY_MUXER           ] = 13,
+    [16+AV_CLASS_CATEGORY_DEMUXER         ] =  5,
+    [16+AV_CLASS_CATEGORY_ENCODER         ] = 11,
+    [16+AV_CLASS_CATEGORY_DECODER         ] =  3,
     [16+AV_CLASS_CATEGORY_FILTER          ] =  1,
     [16+AV_CLASS_CATEGORY_BITSTREAM_FILTER] =  9,
 };
@@ -68,12 +70,12 @@ static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
     [AV_LOG_VERBOSE/8] = 0x02,
     [AV_LOG_DEBUG  /8] = 0x02,
     [16+AV_CLASS_CATEGORY_NA              ] =    9,
-    [16+AV_CLASS_CATEGORY_INPUT           ] = 0x06,
-    [16+AV_CLASS_CATEGORY_OUTPUT          ] = 0x16,
-    [16+AV_CLASS_CATEGORY_MUXER           ] = 0x06,
-    [16+AV_CLASS_CATEGORY_DEMUXER         ] = 0x16,
-    [16+AV_CLASS_CATEGORY_ENCODER         ] = 0x05,
-    [16+AV_CLASS_CATEGORY_DECODER         ] = 0x15,
+    [16+AV_CLASS_CATEGORY_INPUT           ] = 0x15,
+    [16+AV_CLASS_CATEGORY_OUTPUT          ] = 0x05,
+    [16+AV_CLASS_CATEGORY_MUXER           ] = 0x15,
+    [16+AV_CLASS_CATEGORY_DEMUXER         ] = 0x05,
+    [16+AV_CLASS_CATEGORY_ENCODER         ] = 0x16,
+    [16+AV_CLASS_CATEGORY_DECODER         ] = 0x06,
     [16+AV_CLASS_CATEGORY_FILTER          ] = 0x04,
     [16+AV_CLASS_CATEGORY_BITSTREAM_FILTER] = 0x14,
 };
@@ -121,6 +123,11 @@ const char *av_default_item_name(void *ptr)
     return (*(AVClass **) ptr)->class_name;
 }
 
+AVClassCategory av_default_get_category(void *ptr)
+{
+    return (*(AVClass **) ptr)->category;
+}
+
 static void sanitize(uint8_t *line){
     while(*line){
         if(*line < 0x08 || (*line > 0x0D && *line < 0x20))
@@ -129,17 +136,21 @@ static void sanitize(uint8_t *line){
     }
 }
 
-static int get_category(AVClass *avc){
+static int get_category(void *ptr){
+    AVClass *avc = *(AVClass **) ptr;
     if(    !avc
         || (avc->version&0xFF)<100
-        ||  avc->version < (51 << 16 | 56 << 8)
+        ||  avc->version < (51 << 16 | 59 << 8)
         ||  avc->category >= AV_CLASS_CATEGORY_NB) return AV_CLASS_CATEGORY_NA + 16;
 
+    if(avc->get_category)
+        return avc->get_category(ptr) + 16;
+
     return avc->category + 16;
 }
 
 static void format_line(void *ptr, int level, const char *fmt, va_list vl,
-                        char part[3][512], int part_size, int *print_prefix, int type[2])
+                        char part[3][LINE_SZ], int part_size, int *print_prefix, int type[2])
 {
     AVClass* avc = ptr ? *(AVClass **) ptr : NULL;
     part[0][0] = part[1][0] = part[2][0] = 0;
@@ -151,12 +162,12 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl,
             if (parent && *parent) {
                 snprintf(part[0], part_size, "[%s @ %p] ",
                          (*parent)->item_name(parent), parent);
-                if(type) type[0] = get_category(*parent);
+                if(type) type[0] = get_category(((uint8_t *) ptr) + avc->parent_log_context_offset);
             }
         }
         snprintf(part[1], part_size, "[%s @ %p] ",
                  avc->item_name(ptr), ptr);
-        if(type) type[1] = get_category(avc);
+        if(type) type[1] = get_category(ptr);
     }
 
     vsnprintf(part[2], part_size, fmt, vl);
@@ -167,7 +178,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl,
 void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
                         char *line, int line_size, int *print_prefix)
 {
-    char part[3][512];
+    char part[3][LINE_SZ];
     format_line(ptr, level, fmt, vl, part, sizeof(part[0]), print_prefix, NULL);
     snprintf(line, line_size, "%s%s%s", part[0], part[1], part[2]);
 }
@@ -176,9 +187,9 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
 {
     static int print_prefix = 1;
     static int count;
-    static char prev[1024];
-    char part[3][512];
-    char line[1024];
+    static char prev[LINE_SZ];
+    char part[3][LINE_SZ];
+    char line[LINE_SZ];
     static int is_atty;
     int type[2];