scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 02:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

av_log_ug_callback: fixed incremental printout

Browse Source 
FFmpeg doesn't always use to logger for whole lines, resulting in
smoething like:

    [lavc libx264 @ 0x6e93f000b280] Possible tunes:[lavc libx264 @ 0x6e93f000b280]  film[lavc libx264 @ 0x6e93f000b280]  animation[lavc libx264 @ 0x6e93f000b280]  grain[lavc libx264 @ 0x6e93f000b280]  stillimage[lavc libx264 @ 0x6e93f000b280]  psnr[lavc libx264 @ 0x6e93f000b280]  ssim[lavc libx264 @ 0x6e93f000b280]  fastdecode[lavc libx264 @ 0x6e93f000b280]  zerolatency[lavc libx264 @ 0x6e93f000b280]

So we should prefix only the line after <nl>.
This commit is contained in:
Martin Pulec
2023-01-13 10:05:22 +01:00
parent 3ebacd0eb0
commit 808b3de382
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libavcodec/lavc_common.c
View File

@@ -219,13 +219,21 @@ static void av_log_ug_callback(void *avcl, int av_level, const char *fmt, va_lis
if (av_log_filter(ff_module_name, fmt)) {
return;
}
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static _Bool nl_presented = 1;
char new_fmt[1024];
if (ff_module_name) {
snprintf(new_fmt, sizeof new_fmt, "[lavc %s @ %p] %s", ff_module_name, avcl, fmt);
} else {
snprintf(new_fmt, sizeof new_fmt, "[lavc] %s", fmt);
pthread_mutex_lock(&lock);
if (nl_presented) {
if (ff_module_name) {
snprintf(new_fmt, sizeof new_fmt, "[lavc %s @ %p] %s", ff_module_name, avcl, fmt);
} else {
snprintf(new_fmt, sizeof new_fmt, "[lavc] %s", fmt);
}
fmt = new_fmt;
}
log_vprintf(level, new_fmt, vl);
nl_presented = fmt[strlen(fmt) - 1] == '\n';
log_vprintf(level, fmt, vl);
pthread_mutex_unlock(&lock);
}
ADD_TO_PARAM("lavcd-log-level",