[FFmpeg-devel] [PATCH v8 0/3] avutil/log: Add log flag to control printing of memory addresses

[ffmpegagent <ffmpegagent@gmail.com>]

--and disable by default in fftools. The benefits are:

 * Smaller log file sizes
 * Makes log files better readable
 * Allows comparing and viewing log file diffs without almost every line
   being different due to those addresses


Before
======

[hevc @ 0000018e72a89cc0] nal_unit_type:
[hevc @ 0000018e72a89cc0] Decoding PPS
[hevc @ 0000018e72a89cc0] nal_unit_type: 39(SEI_P.. [hevc @
0000018e72a89cc0] Decoding SEI
[mp4 @ 0000018e72a8e240] All [mp4 @ 0000018e72a8e240] Afte [hevc @
0000018e742f6b40] Decoded frame with POC .. detected 16 logical cores
[Parsed_scale_0 @ 0000018e74382f40] Setting 'w' t.. [Parsed_scale_0 @
0000018e74382f40] Setting 'h' t.. [Parsed_scale_1 @ 0000018e74382440]
Setting 'w' t.. [mjpeg @ 0000018e743210c0] Forcing thread count t.. [mjpeg @
0000018e743210c0] intra_quant_bias = 96


After
=====

[hevc] nal_unit_type: [hevc] Decoding PPS
[hevc] nal_unit_type: 39(SEI_P.. [hevc] Decoding SEI
[mp4] All info found
[mp4] After avformat_find_ [hevc] Decoded frame with POC 2.
[Parsed_scale_0] Setting 'w' t.. [Parsed_scale_0] Setting 'h' t..
[Parsed_scale_1] Setting 'w' t.. [mjpeg] Forcing thread count t.. [mjpeg]
intra_quant_bias = 96


Versions
========


V2
==

 * Added log flag for optionally restoring the previous behavior (as
   requested by Gyan)


V3
==

 * Externalize the prefix formatting with a prefix_format callback


V4
==

 * Implement a custom logging callback function for fftools instead of the
   prefix formatting callback (as suggested by Hendrik Leppkes)


V5
==

 * Remove unused var
 * Add missing include to fix build error on PPC (thanks, Michael)


V6
==

 * No more changes to avutil involved
 * Let fftools have its own management of log level and flags (as figured to
   be most likely what Nicolas George was alluding to)


V7
==

 * Minimal version without "simple id" substitution
 * Defaults for printing mem addresses:
   * fftools: off
   * avutil: on


V8
==

 * Negated flag logic
 * Use singular naming
 * Fix flag doc text (thanks, Andreas!)

softworkz (3):
  avutil/log: Add log flag AV_LOG_PRINT_MEMADDRESSES
  fftools: add memaddress log flag and disable printing addresses by
    default
  doc/fftools-common-opts: document memaddress log flag

 doc/APIchanges               | 3 +++
 doc/fftools-common-opts.texi | 2 ++
 fftools/ffmpeg.c             | 2 +-
 fftools/ffplay.c             | 2 +-
 fftools/ffprobe.c            | 2 +-
 fftools/opt_common.c         | 6 ++++++
 libavutil/log.c              | 6 ++++--
 libavutil/log.h              | 5 +++++
 libavutil/version.h          | 2 +-
 9 files changed, 24 insertions(+), 6 deletions(-)


base-commit: 02eda84bf2fcf0db7793872204b0f564a6557232
Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-59%2Fsoftworkz%2Fsubmit_logaddresses-v8
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-59/softworkz/submit_logaddresses-v8
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/59

Range-diff vs v7:

 1:  6c2d6f1e97 ! 1:  0ce5bd11d7 avutil/log: Add log flag AV_LOG_PRINT_MEMADDRESSES
     @@ Commit message
          avutil/log: Add log flag AV_LOG_PRINT_MEMADDRESSES
      
          which is controls prefix formatting. With this flag set, the prefix is
     -    printed including the memory address, otherwise it is omitted.
     -    In libavutil, the flag is set by default, retaining the previous
     -    behavior. fftools remove the flag as default.
     +    printed without the memory address, otherwise it is included.
      
          Signed-off-by: softworkz <softworkz@hotmail.com>
      
     @@ doc/APIchanges
       The last version increases of all libraries were on 2025-03-28
       
      +2025-03-xx - xxxxxxxxxx - lavu 60.2.100 - log.h
     -+  Add flag AV_LOG_PRINT_MEMADDRESSES
     ++  Add flag AV_LOG_NO_PRINT_MEMADDRESS
      +
       API changes, most recent first:
       
       2025-04-07 - 19e9a203b7 - lavu 60.01.100 - dict.h
      
       ## libavutil/log.c ##
     -@@ libavutil/log.c: static AVMutex mutex = AV_MUTEX_INITIALIZER;
     - #endif
     - 
     - static int av_log_level = AV_LOG_INFO;
     --static int flags;
     -+static int flags = AV_LOG_PRINT_MEMADDRESSES;
     - 
     - #define NB_LEVELS 8
     - #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE
      @@ libavutil/log.c: static void format_line(void *avcl, int level, const char *fmt, va_list vl,
       
           if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16;
           if (*print_prefix && avc) {
     -+        const char *p_fmt = flags & AV_LOG_PRINT_MEMADDRESSES ? "[%s @ %p] " : "[%s] ";
     ++        const char *p_fmt = flags & AV_LOG_NO_PRINT_MEMADDRESS ? "[%s] " : "[%s @ %p] ";
      +
               if (avc->parent_log_context_offset) {
                   AVClass** parent = *(AVClass ***) (((uint8_t *) avcl) +
     @@ libavutil/log.h: int av_log_format_line2(void *ptr, int level, const char *fmt,
       #define AV_LOG_PRINT_DATETIME 8
       
      +/**
     -+ * Print memory addresses instead of logical ids in the AVClass prefix.
     ++ * Do not print memory addresses of context instances.
      + */
     -+#define AV_LOG_PRINT_MEMADDRESSES 16
     ++#define AV_LOG_NO_PRINT_MEMADDRESS 16
      +
       void av_log_set_flags(int arg);
       int av_log_get_flags(void);
 2:  7c4cfd5f67 ! 2:  527cf5fa56 fftools/opt_common: add memaddresses log flag
     @@ Metadata
      Author: softworkz <softworkz@hotmail.com>
      
       ## Commit message ##
     -    fftools/opt_common: add memaddresses log flag
     +    fftools: add memaddress log flag and disable printing addresses by default
      
     -    This commit adds the memaddresses log flag.
     +    This commit adds the memaddress log flag.
          When specifying this flag at the command line, context prefixes will
          be printed with memory addresses like in earlier ffmpeg versions.
      
     @@ Commit message
      
          Signed-off-by: softworkz <softworkz@hotmail.com>
      
     + ## fftools/ffmpeg.c ##
     +@@ fftools/ffmpeg.c: int main(int argc, char **argv)
     + 
     +     setvbuf(stderr,NULL,_IONBF,0); /* win32 runtime needs this */
     + 
     +-    av_log_set_flags(AV_LOG_SKIP_REPEATED);
     ++    av_log_set_flags(AV_LOG_SKIP_REPEATED | AV_LOG_NO_PRINT_MEMADDRESS);
     +     parse_loglevel(argc, argv, options);
     + 
     + #if CONFIG_AVDEVICE
     +
     + ## fftools/ffplay.c ##
     +@@ fftools/ffplay.c: int main(int argc, char **argv)
     + 
     +     init_dynload();
     + 
     +-    av_log_set_flags(AV_LOG_SKIP_REPEATED);
     ++    av_log_set_flags(AV_LOG_SKIP_REPEATED | AV_LOG_NO_PRINT_MEMADDRESS);
     +     parse_loglevel(argc, argv, options);
     + 
     +     /* register all codecs, demux and protocols */
     +
     + ## fftools/ffprobe.c ##
     +@@ fftools/ffprobe.c: int main(int argc, char **argv)
     + 
     +     init_dynload();
     + 
     +-    av_log_set_flags(AV_LOG_SKIP_REPEATED);
     ++    av_log_set_flags(AV_LOG_SKIP_REPEATED | AV_LOG_NO_PRINT_MEMADDRESS);
     + 
     +     options = real_options;
     +     parse_loglevel(argc, argv, options);
     +
       ## fftools/opt_common.c ##
     -@@ fftools/opt_common.c: int opt_loglevel(void *optctx, const char *opt, const char *arg)
     -     int level = av_log_get_level();
     -     int cmd, i = 0;
     - 
     -+    // libavutil has this enabled by default, fftools sets this off by default
     -+    flags &= ~AV_LOG_PRINT_MEMADDRESSES;
     -+
     -     av_assert0(arg);
     -     while (*arg) {
     -         token = arg;
      @@ fftools/opt_common.c: int opt_loglevel(void *optctx, const char *opt, const char *arg)
                   } else {
                       flags |= AV_LOG_PRINT_DATETIME;
                   }
     -+        } else if (av_strstart(token, "memaddresses", &arg)) {
     ++        } else if (av_strstart(token, "memaddress", &arg)) {
      +            if (cmd == '-') {
     -+                flags &= ~AV_LOG_PRINT_MEMADDRESSES;
     ++                flags |= AV_LOG_NO_PRINT_MEMADDRESS;
      +            } else {
     -+                flags |= AV_LOG_PRINT_MEMADDRESSES;
     ++                flags &= ~AV_LOG_NO_PRINT_MEMADDRESS;
      +            }
               } else {
                   break;
               }
     -@@ fftools/opt_common.c: int opt_loglevel(void *optctx, const char *opt, const char *arg)
     -         arg++;
     -     } else if (!i) {
     -         flags = av_log_get_flags();  /* level value without prefix, reset flags */
     -+        flags &= ~AV_LOG_PRINT_MEMADDRESSES;
     -     }
     - 
     -     for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++) {
 3:  6d3f305d0f ! 3:  22c51897c1 doc/fftools-common-opts: document memaddresses log flag
     @@ Metadata
      Author: softworkz <softworkz@hotmail.com>
      
       ## Commit message ##
     -    doc/fftools-common-opts: document memaddresses log flag
     +    doc/fftools-common-opts: document memaddress log flag
      
          Signed-off-by: softworkz <softworkz@hotmail.com>
      
     @@ doc/fftools-common-opts.texi: log to file.
       Indicates that log lines should be prefixed with time information.
       @item datetime
       Indicates that log lines should be prefixed with date and time information.
     -+@item memaddresses
     -+Indicates that context prefixes should be printed with memory addresses rather than logical ids.
     ++@item memaddress
     ++Indicates that context prefixes should be printed with memory address.
       @end table
       Flags can also be used alone by adding a '+'/'-' prefix to set/reset a single
       flag without affecting other @var{flags} or changing @var{loglevel}. When

-- 
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".