[FFmpeg-cvslog] avutil/log: Add av_log_once() for printing a message just once with a high log level
Michael Niedermayer
git at videolan.org
Wed Feb 12 12:15:26 EET 2020
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jan 16 16:34:07 2020 +0100| [3182114f8815cb3324dd300d8254ecdb07dbe097] | committer: Michael Niedermayer
avutil/log: Add av_log_once() for printing a message just once with a high log level
Compared to ad-hoc if(printed) ... code this allows the user to disable
it by adjusting the log level
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3182114f8815cb3324dd300d8254ecdb07dbe097
---
doc/APIchanges | 3 +++
libavutil/log.c | 9 +++++++++
libavutil/log.h | 21 +++++++++++++++++++++
libavutil/version.h | 2 +-
4 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 81969c301c..30f188d6aa 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first:
+2020-02-12 - xxxxxxxxxx - lavu 56.40.100 - log.h
+ Add av_log_once().
+
2020-02-04 - xxxxxxxxxx - lavu 56.39.100 - hwcontext.h
Add AV_PIX_FMT_VULKAN
Add AV_HWDEVICE_TYPE_VULKAN and implementation.
diff --git a/libavutil/log.c b/libavutil/log.c
index 78e703b9e9..8d4945249e 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -412,6 +412,15 @@ void av_log(void* avcl, int level, const char *fmt, ...)
va_end(vl);
}
+void av_log_once(void* avcl, int initial_level, int subsequent_level, int *state, const char *fmt, ...)
+{
+ va_list vl;
+ va_start(vl, fmt);
+ av_vlog(avcl, *state ? subsequent_level : initial_level, fmt, vl);
+ va_end(vl);
+ *state = 1;
+}
+
void av_vlog(void* avcl, int level, const char *fmt, va_list vl)
{
AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
diff --git a/libavutil/log.h b/libavutil/log.h
index d9554e609d..9c14188a9c 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -233,6 +233,27 @@ typedef struct AVClass {
*/
void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
+/**
+ * Send the specified message to the log once with the initial_level and then with
+ * the subsequent_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different logging callback
+ * function.
+ * @see av_log
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct or NULL if general log.
+ * @param initial_level importance level of the message expressed using a @ref
+ * lavu_log_constants "Logging Constant" for the first occurance.
+ * @param subsequent_level importance level of the message expressed using a @ref
+ * lavu_log_constants "Logging Constant" after the first occurance.
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @param state a variable to keep trak of if a message has already been printed
+ * this must be initialized to 0 before the first use. The same state
+ * must not be accessed by 2 Threads simultaneously.
+ */
+void av_log_once(void* avcl, int initial_level, int subsequent_level, int *state, const char *fmt, ...) av_printf_format(5, 6);
+
/**
* Send the specified message to the log if the level is less than or equal
diff --git a/libavutil/version.h b/libavutil/version.h
index 2bc1b98615..633a21dca3 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 56
-#define LIBAVUTIL_VERSION_MINOR 39
+#define LIBAVUTIL_VERSION_MINOR 40
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list