From 3a015b9ec7186a41c91f6d0a565aea237806c8f4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 25 Jan 2016 10:43:35 +0100 Subject: video: remove some useless old RGB formats Some VOs had support for these - remove them. Typically, these formats will have only some use in cases where using RGB software conversion with libswscale is faster than letting the VO/GPU do it (i.e. almost never). For the sake of testing this case, keep IMGFMT_RGB565. This is the least messy format, because it has no padding/alpha bits with unknown semantics. Note that decoding to these formats still works. We'll let libswscale repack the data to whatever the VO in use can take. --- video/img_format.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'video/img_format.h') diff --git a/video/img_format.h b/video/img_format.h index 80acb2b3be..b18a6f5d3f 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -178,23 +178,8 @@ enum mp_imgfmt { IMGFMT_RGB0_START = IMGFMT_0RGB, IMGFMT_RGB0_END = IMGFMT_RGB0, - // Accessed with bit-shifts (components ordered from MSB to LSB) - IMGFMT_BGR8, // r3 g3 b2 - IMGFMT_RGB8, - IMGFMT_BGR4_BYTE, // r1 g2 b1 with 1 pixel per byte - IMGFMT_RGB4_BYTE, - IMGFMT_BGR4, // r1 g2 b1, bit-packed - IMGFMT_RGB4, - IMGFMT_MONO, // 1 bit per pixel, bit-packed - IMGFMT_MONO_W, // like IMGFMT_MONO, but inverted (white pixels) - // Accessed with bit-shifts after endian-swapping the uint16_t pixel - IMGFMT_RGB444, // 4r 4g 4b 4a (MSB to LSB) - IMGFMT_RGB555, // 5r 5g 5b 1a - IMGFMT_RGB565, // 5r 6g 5b - IMGFMT_BGR444, // 4b 4r 4g 4a - IMGFMT_BGR555, // 5b 5g 5r 1a - IMGFMT_BGR565, // 5b 6g 5r + IMGFMT_RGB565, // 5r 6g 5b (MSB to LSB) // The first plane has 1 byte per pixel. The second plane is a palette with // 256 entries, with each entry encoded like in IMGFMT_BGR32. -- cgit v1.2.3