Soft Works (12021-08-09): > Signed-off-by: softworkz <softwo...@hotmail.com> > --- > v2: split commits differently, fix AVBPrint finalization > doc/APIchanges | 3 +++ > libavutil/log.c | 33 ++++++++++++++++++++++++++++++--- > libavutil/log.h | 10 ++++++++++ > libavutil/version.h | 2 +- > 4 files changed, 44 insertions(+), 4 deletions(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index 6eefc7fc33..be707314f3 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -14,6 +14,9 @@ libavutil: 2021-04-27 > > API changes, most recent first: > > +2021-08-09 - xxxxxxxxxx - lavu 57.4.100 - log.h > + Add new defines: AV_LOG_PRINT_TIME and AV_LOG_PRINT_DATETIME > + > 2021-08-02 - xxxxxxxxxx - lavc 59.4.100 - packet.h > Add AVPacket.opaque, AVPacket.opaque_ref, AVPacket.time_base. > > diff --git a/libavutil/log.c b/libavutil/log.c > index 66defa9c42..f29533a91f 100644 > --- a/libavutil/log.c > +++ b/libavutil/log.c > @@ -40,6 +40,8 @@ > #include "internal.h" > #include "log.h" > #include "thread.h" > +#include "time.h" > +#include "time_internal.h" > > static AVMutex mutex = AV_MUTEX_INITIALIZER; > > @@ -289,14 +291,32 @@ static const char *get_level_str(int level) > } > } >
> +static void format_date_now(AVBPrint* timeBuf, int include_date)
Pointer mark belongs with the variable, not with the type. Even if the
surrounding code is wrong too.
> +{
> + struct tm *ptm, tmbuf;
> + int64_t time_us = av_gettime();
> + int64_t time_ms = time_us / 1000;
You can merge these two lines, since time_us is used only there.
> + const time_t time_s = time_ms / 1000;
> + int millisec = time_ms - (time_s * 1000);
Using % would probably be more easily optimized by compilers.
> + ptm = localtime_r(&time_s, &tmbuf);
> + if (ptm) {
> + if (include_date)
> + av_bprint_strftime(timeBuf, "%Y-%m-%d ", ptm);
> +
> + av_bprint_strftime(timeBuf, "%H:%M:%S", ptm);
Are we ok printing a local time without a time zone?
> + av_bprintf(timeBuf, ".%03d ", millisec);
> + }
> +}
> +
> static void format_line(void *avcl, int level, const char *fmt, va_list vl,
> - AVBPrint part[4], int *print_prefix, int type[2])
> + AVBPrint part[5], int *print_prefix, int type[2])
> {
> AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
> av_bprint_init(part+0, 0, AV_BPRINT_SIZE_AUTOMATIC);
> av_bprint_init(part+1, 0, AV_BPRINT_SIZE_AUTOMATIC);
> av_bprint_init(part+2, 0, AV_BPRINT_SIZE_AUTOMATIC);
> av_bprint_init(part+3, 0, 65536);
> + av_bprint_init(part+4, 0, AV_BPRINT_SIZE_AUTOMATIC);
>
> if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16;
> if (*print_prefix && avc) {
> @@ -314,6 +334,10 @@ static void format_line(void *avcl, int level, const
> char *fmt, va_list vl,
> if(type) type[1] = get_category(avcl);
> }
>
> + if (*print_prefix
> + && ((flags & AV_LOG_PRINT_TIME) || (flags & AV_LOG_PRINT_DATETIME)))
flags & (AV_LOG_PRINT_TIME | AV_LOG_PRINT_DATETIME)
> + format_date_now(&part[4], flags & AV_LOG_PRINT_DATETIME);
> +
> if (*print_prefix && (level > AV_LOG_QUIET) && (flags &
> AV_LOG_PRINT_LEVEL))
> av_bprintf(part+2, "[%s] ", get_level_str(level));
>
> @@ -334,7 +358,7 @@ void av_log_format_line(void *ptr, int level, const char
> *fmt, va_list vl,
> int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
> char *line, int line_size, int *print_prefix)
> {
> - AVBPrint part[4];
> + AVBPrint part[5];
> int ret;
>
> format_line(ptr, level, fmt, vl, part, print_prefix, NULL);
> @@ -348,7 +372,7 @@ 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[LINE_SZ];
> - AVBPrint part[4];
> + AVBPrint part[5];
> char line[LINE_SZ];
> static int is_atty;
> int type[2];
> @@ -383,6 +407,9 @@ void av_log_default_callback(void* ptr, int level, const
> char* fmt, va_list vl)
> count = 0;
> }
> strcpy(prev, line);
> +
> + sanitize(part[4].str);
Not really necessary.
> + colored_fputs(7, 0, part[4].str);
> sanitize(part[0].str);
> colored_fputs(type[0], 0, part[0].str);
> sanitize(part[1].str);
> diff --git a/libavutil/log.h b/libavutil/log.h
> index 8727c38afc..27eb071884 100644
> --- a/libavutil/log.h
> +++ b/libavutil/log.h
> @@ -377,6 +377,16 @@ int av_log_format_line2(void *ptr, int level, const char
> *fmt, va_list vl,
> */
> #define AV_LOG_PRINT_LEVEL 2
>
> +/**
> + * Include system time in log output.
"local time"
> + */
> +#define AV_LOG_PRINT_TIME 4
> +
> +/**
> + * Include system date and time in log output.
Ditto.
> + */
> +#define AV_LOG_PRINT_DATETIME 8
> +
> void av_log_set_flags(int arg);
> int av_log_get_flags(void);
>
> diff --git a/libavutil/version.h b/libavutil/version.h
> index 6b4a265457..201b012596 100644
> --- a/libavutil/version.h
> +++ b/libavutil/version.h
> @@ -79,7 +79,7 @@
> */
>
> #define LIBAVUTIL_VERSION_MAJOR 57
> -#define LIBAVUTIL_VERSION_MINOR 3
> +#define LIBAVUTIL_VERSION_MINOR 4
> #define LIBAVUTIL_VERSION_MICRO 100
>
> #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
Regards,
--
Nicolas George
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
