From aa6ba6372c627bc602647d225bdfb076f93bd291 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 19 Dec 2012 12:04:38 +0100 Subject: mp_image: change how palette is handled According to DOCS/OUTDATED-tech/colorspaces.txt, the following formats are supposed to be palettized: IMGFMT_BGR8 IMGFMT_RGB8, IMGFMT_BGR4_CHAR IMGFMT_RGB4_CHAR IMGFMT_BGR4 IMGFMT_RGB4 Of these, only BGR8 and RGB8 are actually treated as palettized in some way. ffmpeg has only one palettized format (AV_PIX_FMT_PAL8), and IMGFMT_BGR8 was inconsistently mapped to packed non-palettized RGB formats too (AV_PIX_FMT_BGR8). Moreover, vf_scale.c contained messy hacks to generate a palette when AV_PIX_FMT_BGR8 is output. (libswscale does not support AV_PIX_FMT_PAL8 output in the first place.) Get rid of all of this, and introduce IMGFMT_PAL8, which directly maps to AV_PIX_FMT_PAL8. Remove the palette creation code from vf_scale.c. IMGFMT_BGR8 maps to AV_PIX_FMT_RGB8 (don't ask me why it's swapped), without any palette use. Enabling it in vo_x11 or using it as vf_scale input seems to give correct results. --- video/filter/vf.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'video/filter/vf.c') diff --git a/video/filter/vf.c b/video/filter/vf.c index b31d8b3971..1d21413787 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -380,6 +380,9 @@ void vf_clone_mpi_attributes(mp_image_t *dst, mp_image_t *src) dst->colorspace = src->colorspace; dst->levels = src->levels; } + if (dst->imgfmt == IMGFMT_PAL8 && src->imgfmt == IMGFMT_PAL8) { + memcpy(dst->planes[1], src->planes[1], MP_PALETTE_SIZE); + } } // Used by filters to add a filtered frame to the output queue. -- cgit v1.2.3