diff options
| author | Marton Balint <cus@passwd.hu> | 2020-01-29 01:10:38 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-02-09 20:31:44 +0100 |
| commit | cbf2a9bfac60e400980b503061922aedeedd9e28 (patch) | |
| tree | c5c6df767c8ac63582b904fddf886b13baa57c89 /libavutil | |
| parent | 31acaa1ec61381ac6a6c38908fa860d62744ee62 (diff) | |
| download | ffmpeg-cbf2a9bfac60e400980b503061922aedeedd9e28.tar.gz | |
avutil/log: add support for multibyte console log for win32
Fixes ticket #5398.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/log.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 213594c2a5..78e703b9e9 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -120,6 +120,31 @@ static const uint32_t color[16 + AV_CLASS_CATEGORY_NB] = { #endif static int use_color = -1; +#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE +static void win_console_puts(const char *str) +{ + const uint8_t *q = str; + uint16_t line[LINE_SZ]; + + while (*q) { + uint16_t *buf = line; + DWORD nb_chars = 0; + DWORD written; + + while (*q && nb_chars < LINE_SZ - 1) { + uint32_t ch; + uint16_t tmp; + + GET_UTF8(ch, *q ? *q++ : 0, ch = 0xfffd; goto continue_on_invalid;) +continue_on_invalid: + PUT_UTF16(ch, tmp, *buf++ = tmp; nb_chars++;) + } + + WriteConsoleW(con, line, nb_chars, &written, NULL); + } +} +#endif + static void check_color_terminal(void) { char *term = getenv("TERM"); @@ -195,7 +220,7 @@ static void colored_fputs(int level, int tint, const char *str) if (con != INVALID_HANDLE_VALUE) { if (local_use_color) SetConsoleTextAttribute(con, background | color[level]); - fputs(str, stderr); + win_console_puts(str); if (local_use_color) SetConsoleTextAttribute(con, attr_orig); } else { |