From 2f7f6fdb9d21648cb14ac0125d61c6215a11b263 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 17 Jan 2010 14:40:44 +0000 Subject: More format support in fmt-conversion.c: split RGB32 and BGR32 into ARGB, BGRA, ABGR, RGBA. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30351 b3059339-0415-0410-9bf9-f77b7e298cf2 --- fmt-conversion.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'fmt-conversion.c') diff --git a/fmt-conversion.c b/fmt-conversion.c index 9371ab1a11..de2f2c572d 100644 --- a/fmt-conversion.c +++ b/fmt-conversion.c @@ -25,7 +25,8 @@ static const struct { int fmt; enum PixelFormat pix_fmt; } conversion_map[] = { - {IMGFMT_BGR32, PIX_FMT_RGB32}, + {IMGFMT_ARGB, PIX_FMT_ARGB}, + {IMGFMT_BGRA, PIX_FMT_BGRA}, {IMGFMT_BGR24, PIX_FMT_BGR24}, {IMGFMT_BGR16, PIX_FMT_RGB565}, {IMGFMT_BGR15, PIX_FMT_RGB555}, @@ -37,7 +38,8 @@ static const struct { {IMGFMT_BG4B, PIX_FMT_RGB4_BYTE}, {IMGFMT_RGB48LE, PIX_FMT_RGB48LE}, {IMGFMT_RGB48BE, PIX_FMT_RGB48BE}, - {IMGFMT_RGB32, PIX_FMT_BGR32}, + {IMGFMT_ABGR, PIX_FMT_ABGR}, + {IMGFMT_RGBA, PIX_FMT_RGBA}, {IMGFMT_RGB24, PIX_FMT_RGB24}, {IMGFMT_RGB16, PIX_FMT_BGR565}, {IMGFMT_RGB15, PIX_FMT_BGR555}, -- cgit v1.2.3 From 89d8ae77a82461e82e7a78eb0e97a1b727675edc Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 17 Jan 2010 14:54:38 +0000 Subject: Add big- and little-endian variants of the 15 and 16 bit RGB/BGR formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30353 b3059339-0415-0410-9bf9-f77b7e298cf2 --- fmt-conversion.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'fmt-conversion.c') diff --git a/fmt-conversion.c b/fmt-conversion.c index de2f2c572d..013e3fea55 100644 --- a/fmt-conversion.c +++ b/fmt-conversion.c @@ -28,8 +28,10 @@ static const struct { {IMGFMT_ARGB, PIX_FMT_ARGB}, {IMGFMT_BGRA, PIX_FMT_BGRA}, {IMGFMT_BGR24, PIX_FMT_BGR24}, - {IMGFMT_BGR16, PIX_FMT_RGB565}, - {IMGFMT_BGR15, PIX_FMT_RGB555}, + {IMGFMT_BGR16BE, PIX_FMT_RGB565BE}, + {IMGFMT_BGR16LE, PIX_FMT_RGB565LE}, + {IMGFMT_BGR15BE, PIX_FMT_RGB555BE}, + {IMGFMT_BGR15LE, PIX_FMT_RGB555LE}, {IMGFMT_BGR8, PIX_FMT_RGB8}, {IMGFMT_BGR4, PIX_FMT_RGB4}, {IMGFMT_BGR1, PIX_FMT_MONOBLACK}, @@ -41,8 +43,10 @@ static const struct { {IMGFMT_ABGR, PIX_FMT_ABGR}, {IMGFMT_RGBA, PIX_FMT_RGBA}, {IMGFMT_RGB24, PIX_FMT_RGB24}, - {IMGFMT_RGB16, PIX_FMT_BGR565}, - {IMGFMT_RGB15, PIX_FMT_BGR555}, + {IMGFMT_RGB16BE, PIX_FMT_BGR565BE}, + {IMGFMT_RGB16LE, PIX_FMT_BGR565LE}, + {IMGFMT_RGB15BE, PIX_FMT_BGR555BE}, + {IMGFMT_RGB15LE, PIX_FMT_BGR555LE}, {IMGFMT_RGB8, PIX_FMT_BGR8}, {IMGFMT_RGB4, PIX_FMT_BGR4}, {IMGFMT_BGR8, PIX_FMT_PAL8}, -- cgit v1.2.3