diff options
| author | wm4 <wm4@nowhere> | 2017-02-21 10:35:38 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-02-21 10:35:38 +0100 |
| commit | e85d06baadeda6b63f315adfcdbdd7c56cd8cf9f (patch) | |
| tree | d755aa12f3f098dd6785f3073099283c205b758d /video/img_format.c | |
| parent | b258327210766ce7a040a075abf681b2130bb80b (diff) | |
| download | mpv-e85d06baadeda6b63f315adfcdbdd7c56cd8cf9f.tar.bz2 mpv-e85d06baadeda6b63f315adfcdbdd7c56cd8cf9f.tar.xz | |
img_format: stop setting some fields to dummy values for hwaccel formats
Flags like MP_IMGFLAG_YUV were meaningless for hwaccel formats, and
setting fields like component_bits made even less sense.
Diffstat (limited to 'video/img_format.c')
| -rw-r--r-- | video/img_format.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/video/img_format.c b/video/img_format.c index 0232f53890..395ba7e2d5 100644 --- a/video/img_format.c +++ b/video/img_format.c @@ -211,7 +211,9 @@ struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt) ? MP_IMGFLAG_BE : MP_IMGFLAG_LE; } - if (fmt == AV_PIX_FMT_XYZ12LE || fmt == AV_PIX_FMT_XYZ12BE) { + if ((pd->flags & AV_PIX_FMT_FLAG_HWACCEL)) { + desc.flags |= MP_IMGFLAG_HWACCEL; + } else if (fmt == AV_PIX_FMT_XYZ12LE || fmt == AV_PIX_FMT_XYZ12BE) { desc.flags |= MP_IMGFLAG_XYZ; } else if (!(pd->flags & AV_PIX_FMT_FLAG_RGB) && fmt != AV_PIX_FMT_MONOBLACK && @@ -290,11 +292,10 @@ struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt) if ((desc.bpp[0] % 8) != 0) desc.align_x = 8 / desc.bpp[0]; // expect power of 2 - if (pd->flags & AV_PIX_FMT_FLAG_HWACCEL) { - desc.flags |= MP_IMGFLAG_HWACCEL; - desc.component_bits = 8; // usually restricted to 8 bit; may change - desc.component_full_bits = desc.component_bits; - desc.plane_bits = desc.component_bits; + if (desc.flags & MP_IMGFLAG_HWACCEL) { + desc.component_bits = 0; + desc.component_full_bits = 0; + desc.plane_bits = 0; } if (desc.chroma_xs || desc.chroma_ys) |