RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2020-04-23 13:00:51 +02:00
parent fe2178160d
commit 28e4fe3010
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/ref/img_formats.txt
View File

@ -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]

4
video/img_format.c
View File

@ -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;