From 28e4fe3010ecb0e1ddc964613c9205d7df95922f Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 23 Apr 2020 13:00:51 +0200 Subject: img_format: treat both monow and monob as RGB This was inconsistent for unknown reason. monob was the way we wanted it, and handling of monow was missing. See the previous "img_format: add some mpv-only helper formats" commit. Matters for the zimg wrapper. --- test/ref/img_formats.txt | 4 ++-- video/img_format.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/ref/img_formats.txt b/test/ref/img_formats.txt index c0c4d8bb4d..0abbbe94ee 100644 --- a/test/ref/img_formats.txt +++ b/test/ref/img_formats.txt @@ -716,8 +716,8 @@ monob: [GENERIC] fcsp=rgb ctype=uint {0/1/[0:0] 0/0/[0:0] 0/0/[0:0] 0/0/[0:0] } AVD: name=monob chroma=0:0 flags=0x4 [bs] 0: p=0 st=1 o=0 sh=7 d=1 -monow: [GENERIC] ctype=uint - Legacy desc: [yuv][le][be] +monow: [GENERIC] fcsp=rgb ctype=uint + Legacy desc: [rgb][le][be] planes=1, chroma=0:0 align=8:1 bits=1 cbits=1 {0/1/[0:0] 0/0/[0:0] 0/0/[0:0] 0/0/[0:0] } AVD: name=monow chroma=0:0 flags=0x4 [bs] diff --git a/video/img_format.c b/video/img_format.c index b1247747ea..30f84222c7 100644 --- a/video/img_format.c +++ b/video/img_format.c @@ -416,7 +416,9 @@ enum mp_csp mp_imgfmt_get_forced_csp(int imgfmt) if (pixdesc && (pixdesc->flags & AV_PIX_FMT_FLAG_RGB)) return MP_CSP_RGB; - if (pixfmt == AV_PIX_FMT_PAL8 || pixfmt == AV_PIX_FMT_MONOBLACK) + if (pixfmt == AV_PIX_FMT_PAL8 || + pixfmt == AV_PIX_FMT_MONOBLACK || + pixfmt == AV_PIX_FMT_MONOWHITE) return MP_CSP_RGB; return MP_CSP_AUTO; -- cgit v1.2.3