From: Anthony Liguori <anthony@codemonkey.ws>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2] add pflib: PixelFormat conversion library.
Date: Mon, 14 Jun 2010 11:30:01 -0500 [thread overview]
Message-ID: <4C165909.9060605@codemonkey.ws> (raw)
In-Reply-To: <1276530378-24326-1-git-send-email-kraxel@redhat.com>
On 06/14/2010 10:46 AM, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
> ---
> Makefile.objs | 1 +
> pflib.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> pflib.h | 6 ++
> 3 files changed, 220 insertions(+), 0 deletions(-)
> create mode 100644 pflib.c
> create mode 100644 pflib.h
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 2dad0f9..6201675 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -83,6 +83,7 @@ common-obj-y += qemu-char.o savevm.o #aio.o
> common-obj-y += msmouse.o ps2.o
> common-obj-y += qdev.o qdev-properties.o
> common-obj-y += block-migration.o
> +common-obj-y += pflib.o
>
> common-obj-$(CONFIG_BRLAPI) += baum.o
> common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
> diff --git a/pflib.c b/pflib.c
> new file mode 100644
> index 0000000..1154d0c
> --- /dev/null
> +++ b/pflib.c
> @@ -0,0 +1,213 @@
> +/*
> + * PixelFormat conversion library.
> + *
> + * Author: Gerd Hoffmann<kraxel@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + */
> +#include "qemu-common.h"
> +#include "console.h"
> +#include "pflib.h"
> +
> +typedef struct QemuPixel QemuPixel;
> +
> +typedef void (*pf_convert)(QemuPfConv *conv,
> + void *dst, void *src, uint32_t cnt);
> +typedef void (*pf_convert_from)(PixelFormat *pf,
> + QemuPixel *dst, void *src, uint32_t cnt);
> +typedef void (*pf_convert_to)(PixelFormat *pf,
> + void *dst, QemuPixel *src, uint32_t cnt);
> +
> +struct QemuPfConv {
> + pf_convert convert;
> + PixelFormat src;
> + PixelFormat dst;
> +
> + /* for copy_generic() */
> + pf_convert_from conv_from;
> + pf_convert_to conv_to;
> + QemuPixel *conv_buf;
> + uint32_t conv_cnt;
> +};
> +
> +struct QemuPixel {
> + uint8_t red;
> + uint8_t green;
> + uint8_t blue;
> + uint8_t alpha;
> +};
> +
> +/* ----------------------------------------------------------------------- */
> +/* PixelFormat -> QemuPixel conversions */
> +
> +static void conv_16_to_pixel(PixelFormat *pf,
> + QemuPixel *dst, void *src, uint32_t cnt)
> +{
> + uint16_t *src16 = src;
> +
> + while (cnt> 0) {
> + dst->red = ((*src16& pf->rmask)>> pf->rshift)<< (8 - pf->rbits);
> + dst->green = ((*src16& pf->gmask)>> pf->gshift)<< (8 - pf->gbits);
> + dst->blue = ((*src16& pf->bmask)>> pf->bshift)<< (8 - pf->bbits);
> + dst->alpha = ((*src16& pf->amask)>> pf->ashift)<< (8 - pf->abits);
> + dst++, src16++, cnt--;
> + }
> +}
> +
> +/* assumes pf->{r,g,b,a}bits == 8 */
> +static void conv_32_to_pixel_fast(PixelFormat *pf,
> + QemuPixel *dst, void *src, uint32_t cnt)
> +{
> + uint32_t *src32 = src;
> +
> + while (cnt> 0) {
> + dst->red = (*src32& pf->rmask)>> pf->rshift;
> + dst->green = (*src32& pf->gmask)>> pf->gshift;
> + dst->blue = (*src32& pf->bmask)>> pf->bshift;
> + dst->alpha = (*src32& pf->amask)>> pf->ashift;
> + dst++, src32++, cnt--;
> + }
> +}
> +
> +static void conv_32_to_pixel_generic(PixelFormat *pf,
> + QemuPixel *dst, void *src, uint32_t cnt)
> +{
> + uint32_t *src32 = src;
> +
> + while (cnt> 0) {
> + if (pf->rbits< 8) {
> + dst->red = ((*src32& pf->rmask)>> pf->rshift)<< (8 - pf->rbits);
> + } else {
> + dst->red = ((*src32& pf->rmask)>> pf->rshift)>> (pf->rbits - 8);
> + }
> + if (pf->gbits< 8) {
> + dst->green = ((*src32& pf->gmask)>> pf->gshift)<< (8 - pf->gbits);
> + } else {
> + dst->green = ((*src32& pf->gmask)>> pf->gshift)>> (pf->gbits - 8);
> + }
> + if (pf->bbits< 8) {
> + dst->blue = ((*src32& pf->bmask)>> pf->bshift)<< (8 - pf->bbits);
> + } else {
> + dst->blue = ((*src32& pf->bmask)>> pf->bshift)>> (pf->bbits - 8);
> + }
> + if (pf->abits< 8) {
> + dst->alpha = ((*src32& pf->amask)>> pf->ashift)<< (8 - pf->abits);
> + } else {
> + dst->alpha = ((*src32& pf->amask)>> pf->ashift)>> (pf->abits - 8);
> + }
> + dst++, src32++, cnt--;
> + }
> +}
> +
> +/* ----------------------------------------------------------------------- */
> +/* QemuPixel -> PixelFormat conversions */
> +
> +static void conv_pixel_to_16(PixelFormat *pf,
> + void *dst, QemuPixel *src, uint32_t cnt)
> +{
> + uint16_t *dst16 = dst;
> +
> + while (cnt> 0) {
> + *dst16 = ((uint16_t)src->red>> (8 - pf->rbits))<< pf->rshift;
> + *dst16 |= ((uint16_t)src->green>> (8 - pf->gbits))<< pf->gshift;
> + *dst16 |= ((uint16_t)src->blue>> (8 - pf->bbits))<< pf->bshift;
> + *dst16 |= ((uint16_t)src->alpha>> (8 - pf->abits))<< pf->ashift;
> + dst16++, src++, cnt--;
> + }
> +}
> +
> +static void conv_pixel_to_32(PixelFormat *pf,
> + void *dst, QemuPixel *src, uint32_t cnt)
> +{
> + uint32_t *dst32 = dst;
> +
> + while (cnt> 0) {
> + *dst32 = ((uint32_t)src->red>> (8 - pf->rbits))<< pf->rshift;
> + *dst32 |= ((uint32_t)src->green>> (8 - pf->gbits))<< pf->gshift;
> + *dst32 |= ((uint32_t)src->blue>> (8 - pf->bbits))<< pf->bshift;
> + *dst32 |= ((uint32_t)src->alpha>> (8 - pf->abits))<< pf->ashift;
> + dst32++, src++, cnt--;
> + }
> +}
> +
> +/* ----------------------------------------------------------------------- */
> +/* PixelFormat -> PixelFormat conversions */
> +
> +static void convert_copy(QemuPfConv *conv, void *dst, void *src, uint32_t cnt)
> +{
> + uint32_t bytes = cnt * conv->src.bytes_per_pixel;
> + memcpy(dst, src, bytes);
> +}
> +
> +static void convert_generic(QemuPfConv *conv, void *dst, void *src, uint32_t cnt)
> +{
> + if (conv->conv_cnt< cnt) {
> + conv->conv_cnt = cnt;
> + conv->conv_buf = qemu_realloc(conv->conv_buf, sizeof(QemuPixel) * conv->conv_cnt);
> + }
> + conv->conv_from(&conv->src, conv->conv_buf, src, cnt);
> + conv->conv_to(&conv->dst, dst, conv->conv_buf, cnt);
> +}
> +
> +/* ----------------------------------------------------------------------- */
> +/* public interface */
> +
> +QemuPfConv *qemu_pf_conv_get(PixelFormat *dst, PixelFormat *src)
> +{
> + QemuPfConv *conv = qemu_mallocz(sizeof(QemuPfConv));
> +
> + conv->src = *src;
> + conv->dst = *dst;
> +
> + if (memcmp(&conv->src,&conv->dst, sizeof(PixelFormat)) == 0) {
> + /* formats identical, can simply copy */
> + conv->convert = convert_copy;
> + } else {
> + /* generic two-step conversion: src -> QemuPixel -> dst */
> + switch (conv->src.bytes_per_pixel) {
> + case 2:
> + conv->conv_from = conv_16_to_pixel;
> + break;
> + case 4:
> + if (conv->src.rbits == 8&& conv->src.gbits == 8&& conv->src.bbits == 8) {
> + conv->conv_from = conv_32_to_pixel_fast;
> + } else {
> + conv->conv_from = conv_32_to_pixel_generic;
> + }
> + break;
> + default:
> + goto err;
> + }
> + switch (conv->dst.bytes_per_pixel) {
> + case 2:
> + conv->conv_to = conv_pixel_to_16;
> + break;
> + case 4:
> + conv->conv_to = conv_pixel_to_32;
> + break;
> + default:
> + goto err;
> + }
> + conv->convert = convert_generic;
> + }
> + return conv;
> +
> +err:
> + qemu_free(conv);
> + return NULL;
> +}
> +
> +void qemu_pf_conv_run(QemuPfConv *conv, void *dst, void *src, uint32_t cnt)
> +{
> + conv->convert(conv, dst, src, cnt);
> +}
> +
> +void qemu_pf_conv_put(QemuPfConv *conv)
> +{
> + if (conv) {
> + qemu_free(conv->conv_buf);
> + qemu_free(conv);
> + }
> +}
> diff --git a/pflib.h b/pflib.h
> new file mode 100644
> index 0000000..8d73fdd
> --- /dev/null
> +++ b/pflib.h
> @@ -0,0 +1,6 @@
>
Missing #if guards and missing license/copyright.
Are you planning on using this somewhere? I'd prefer to merge this with
some code to use it somewhere as right now, it's dead code.
Regards,
Anthony Liguori
> +/* public */
> +typedef struct QemuPfConv QemuPfConv;
> +
> +QemuPfConv *qemu_pf_conv_get(PixelFormat *dst, PixelFormat *src);
> +void qemu_pf_conv_run(QemuPfConv *conv, void *dst, void *src, uint32_t cnt);
> +void qemu_pf_conv_put(QemuPfConv *conv);
>
next prev parent reply other threads:[~2010-06-14 16:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-14 15:46 [Qemu-devel] [PATCH v2] add pflib: PixelFormat conversion library Gerd Hoffmann
2010-06-14 16:30 ` Anthony Liguori [this message]
2010-06-15 8:37 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C165909.9060605@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).