Mercurial > mplayer.hg
view gui/util/bitmap.c @ 33534:22c3241467b3
Remove function Normalize().
This function changed ARGB data as if it had been RGB24 data (not quite
correctly) converted to ARGB with all colors transparent.
Instead now, set the alpha channel for RGB24 data and leave ARGB data
untouched.
For X11, the alpha channel is disregarded, so both approaches are equal,
but the new one is more intelligible as we get correct ARGB PNG data.
For legacy reasons, all kind of fuchsia/magenta must be treated as
transparent, because some skins are using at least both full opaque and
full transparent fuchsia/magenta for transparency.
author | ib |
---|---|
date | Thu, 16 Jun 2011 11:19:15 +0000 |
parents | fd90a10d81a1 |
children | c5a19bbeac2b |
line wrap: on
line source
/* * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include "bitmap.h" #include "help_mp.h" #include "libavcodec/avcodec.h" #include "libavutil/intreadwrite.h" #include "libvo/fastmemcpy.h" #include "mp_msg.h" static int pngRead(unsigned char *fname, txSample *bf) { FILE *file; long len; void *data; int decode_ok, bpl; AVCodecContext *avctx; AVFrame *frame; AVPacket pkt; file = fopen(fname, "rb"); if (!file) return 2; fseek(file, 0, SEEK_END); len = ftell(file); if (len > 50 * 1024 * 1024) { fclose(file); return 3; } data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE); if (!data) { fclose(file); return 4; } fseek(file, 0, SEEK_SET); fread(data, len, 1, file); fclose(file); avctx = avcodec_alloc_context(); frame = avcodec_alloc_frame(); if (!(avctx && frame)) { av_free(frame); av_free(avctx); av_free(data); return 5; } avcodec_register_all(); avcodec_open(avctx, avcodec_find_decoder(CODEC_ID_PNG)); av_init_packet(&pkt); pkt.data = data; pkt.size = len; // HACK: make PNGs decode normally instead of as CorePNG delta frames pkt.flags = AV_PKT_FLAG_KEY; avcodec_decode_video2(avctx, frame, &decode_ok, &pkt); memset(bf, 0, sizeof(*bf)); switch (avctx->pix_fmt) { case PIX_FMT_GRAY8: bf->BPP = 8; break; case PIX_FMT_GRAY16BE: bf->BPP = 16; break; case PIX_FMT_RGB24: bf->BPP = 24; break; case PIX_FMT_BGRA: case PIX_FMT_ARGB: bf->BPP = 32; break; default: bf->BPP = 0; break; } if (decode_ok && bf->BPP) { bf->Width = avctx->width; bf->Height = avctx->height; bpl = bf->Width * (bf->BPP / 8); bf->ImageSize = bpl * bf->Height; mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file: %s\n", fname); mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] size: %lux%lu, color depth: %u\n", bf->Width, bf->Height, bf->BPP); mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] image size: %lu\n", bf->ImageSize); bf->Image = malloc(bf->ImageSize); if (bf->Image) memcpy_pic(bf->Image, frame->data[0], bpl, bf->Height, bpl, frame->linesize[0]); else decode_ok = 0; } avcodec_close(avctx); av_free(frame); av_free(avctx); av_free(data); return !(decode_ok && bf->BPP); } static int Convert24to32(txSample *bf) { char *orgImage; unsigned long i, c; if (bf->BPP == 24) { orgImage = bf->Image; bf->BPP = 32; bf->ImageSize = bf->Width * bf->Height * 4; bf->Image = calloc(1, bf->ImageSize); if (!bf->Image) { free(orgImage); mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", bf->ImageSize); return 0; } mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %lu\n", bf->ImageSize); for (c = 0, i = 0; c < bf->ImageSize; c += 4, i += 3) *(uint32_t *)&bf->Image[c] = ALPHA_OPAQUE | AV_RB24(&orgImage[i]); free(orgImage); } return 1; } static unsigned char *fExist(unsigned char *fname) { static const char ext[][4] = { "png", "PNG" }; static unsigned char buf[512]; unsigned int i; if (access(fname, R_OK) == 0) return fname; for (i = 0; i < FF_ARRAY_ELEMS(ext); i++) { snprintf(buf, sizeof(buf), "%s.%s", fname, ext[i]); if (access(buf, R_OK) == 0) return buf; } return NULL; } int bpRead(char *fname, txSample *bf) { int r; fname = fExist(fname); if (!fname) return -2; r = pngRead(fname, bf); if (r != 0) { mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] read error #%d: %s\n", r, fname); return -5; } if (bf->BPP < 24) { mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] bpp too low: %u\n", bf->BPP); return -1; } if (!Convert24to32(bf)) return -8; return 0; } void bpFree(txSample *bf) { free(bf->Image); memset(bf, 0, sizeof(*bf)); } int Convert32to1(txSample *in, txSample *out) { uint32_t *buf; unsigned long i; int b = 0, c = 0; unsigned char tmp = 0; int shaped = 0; out->Width = in->Width; out->Height = in->Height; out->BPP = 1; out->ImageSize = (out->Width * out->Height + 7) / 8; out->Image = calloc(1, out->ImageSize); if (!out->Image) { mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", out->ImageSize); return 0; } buf = (uint32_t *)in->Image; for (i = 0; i < out->Width * out->Height; i++) { tmp >>= 1; if (!IS_TRANSPARENT(buf[i])) tmp |= 0x80; else { buf[i] = 0; shaped = 1; } if (++b == 8) { out->Image[c++] = tmp; tmp = b = 0; } } if (b) out->Image[c] = tmp; if (!shaped) bpFree(out); mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 1 bpp conversion size: %lu\n", out->ImageSize); return 1; }