Mercurial > mplayer.hg
view fmt-conversion.c @ 33526:140525bcc32f
Fix GUI icon bug.
The GUI icon did not display properly but showed up with various distortions.
The reason was the icon mask which hadn't been put to the X server yet when
used.
The icon itself was okay, but is rendered now in a way that doesn't need a
drawable which spares creating a GTK window and destroying it right after.
The locally used GDK variables have been moved inside the function where
they are needed.
Patch with grateful support by Steaphan Greene, sgreene cs.binghamton edu.
This closes Bugzilla #582.
author | ib |
---|---|
date | Tue, 14 Jun 2011 17:51:17 +0000 |
parents | e1ee4895e500 |
children | 3552dac79b1a |
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 "mp_msg.h" #include "libavutil/avutil.h" #include "libmpcodecs/img_format.h" #include "libavutil/samplefmt.h" #include "libaf/af_format.h" #include "fmt-conversion.h" static const struct { int fmt; enum PixelFormat pix_fmt; } conversion_map[] = { {IMGFMT_ARGB, PIX_FMT_ARGB}, {IMGFMT_BGRA, PIX_FMT_BGRA}, {IMGFMT_BGR24, PIX_FMT_BGR24}, {IMGFMT_BGR16BE, PIX_FMT_RGB565BE}, {IMGFMT_BGR16LE, PIX_FMT_RGB565LE}, {IMGFMT_BGR15BE, PIX_FMT_RGB555BE}, {IMGFMT_BGR15LE, PIX_FMT_RGB555LE}, {IMGFMT_BGR12BE, PIX_FMT_RGB444BE}, {IMGFMT_BGR12LE, PIX_FMT_RGB444LE}, {IMGFMT_BGR8, PIX_FMT_RGB8}, {IMGFMT_BGR4, PIX_FMT_RGB4}, {IMGFMT_BGR1, PIX_FMT_MONOBLACK}, {IMGFMT_RGB1, PIX_FMT_MONOBLACK}, {IMGFMT_RG4B, PIX_FMT_BGR4_BYTE}, {IMGFMT_BG4B, PIX_FMT_RGB4_BYTE}, {IMGFMT_RGB48LE, PIX_FMT_RGB48LE}, {IMGFMT_RGB48BE, PIX_FMT_RGB48BE}, {IMGFMT_ABGR, PIX_FMT_ABGR}, {IMGFMT_RGBA, PIX_FMT_RGBA}, {IMGFMT_RGB24, PIX_FMT_RGB24}, {IMGFMT_RGB16BE, PIX_FMT_BGR565BE}, {IMGFMT_RGB16LE, PIX_FMT_BGR565LE}, {IMGFMT_RGB15BE, PIX_FMT_BGR555BE}, {IMGFMT_RGB15LE, PIX_FMT_BGR555LE}, {IMGFMT_RGB12BE, PIX_FMT_BGR444BE}, {IMGFMT_RGB12LE, PIX_FMT_BGR444LE}, {IMGFMT_RGB8, PIX_FMT_BGR8}, {IMGFMT_RGB4, PIX_FMT_BGR4}, {IMGFMT_BGR8, PIX_FMT_PAL8}, {IMGFMT_YUY2, PIX_FMT_YUYV422}, {IMGFMT_UYVY, PIX_FMT_UYVY422}, {IMGFMT_NV12, PIX_FMT_NV12}, {IMGFMT_NV21, PIX_FMT_NV21}, {IMGFMT_Y800, PIX_FMT_GRAY8}, {IMGFMT_Y8, PIX_FMT_GRAY8}, {IMGFMT_YVU9, PIX_FMT_YUV410P}, {IMGFMT_IF09, PIX_FMT_YUV410P}, {IMGFMT_YV12, PIX_FMT_YUV420P}, {IMGFMT_I420, PIX_FMT_YUV420P}, {IMGFMT_IYUV, PIX_FMT_YUV420P}, {IMGFMT_411P, PIX_FMT_YUV411P}, {IMGFMT_422P, PIX_FMT_YUV422P}, {IMGFMT_444P, PIX_FMT_YUV444P}, {IMGFMT_440P, PIX_FMT_YUV440P}, {IMGFMT_420A, PIX_FMT_YUVA420P}, {IMGFMT_420P16_LE, PIX_FMT_YUV420P16LE}, {IMGFMT_420P16_BE, PIX_FMT_YUV420P16BE}, {IMGFMT_420P10_LE, PIX_FMT_YUV420P10LE}, {IMGFMT_420P10_BE, PIX_FMT_YUV420P10BE}, {IMGFMT_420P9_LE, PIX_FMT_YUV420P9LE}, {IMGFMT_420P9_BE, PIX_FMT_YUV420P9BE}, {IMGFMT_422P16_LE, PIX_FMT_YUV422P16LE}, {IMGFMT_422P16_BE, PIX_FMT_YUV422P16BE}, {IMGFMT_422P10_LE, PIX_FMT_YUV422P10LE}, {IMGFMT_422P10_BE, PIX_FMT_YUV422P10BE}, {IMGFMT_444P16_LE, PIX_FMT_YUV444P16LE}, {IMGFMT_444P16_BE, PIX_FMT_YUV444P16BE}, // YUVJ are YUV formats that use the full Y range and not just // 16 - 235 (see colorspaces.txt). // Currently they are all treated the same way. {IMGFMT_YV12, PIX_FMT_YUVJ420P}, {IMGFMT_422P, PIX_FMT_YUVJ422P}, {IMGFMT_444P, PIX_FMT_YUVJ444P}, {IMGFMT_440P, PIX_FMT_YUVJ440P}, {IMGFMT_XVMC_MOCO_MPEG2, PIX_FMT_XVMC_MPEG2_MC}, {IMGFMT_XVMC_IDCT_MPEG2, PIX_FMT_XVMC_MPEG2_IDCT}, {IMGFMT_VDPAU_MPEG1, PIX_FMT_VDPAU_MPEG1}, {IMGFMT_VDPAU_MPEG2, PIX_FMT_VDPAU_MPEG2}, {IMGFMT_VDPAU_H264, PIX_FMT_VDPAU_H264}, {IMGFMT_VDPAU_WMV3, PIX_FMT_VDPAU_WMV3}, {IMGFMT_VDPAU_VC1, PIX_FMT_VDPAU_VC1}, {IMGFMT_VDPAU_MPEG4, PIX_FMT_VDPAU_MPEG4}, {0, PIX_FMT_NONE} }; enum PixelFormat imgfmt2pixfmt(int fmt) { int i; enum PixelFormat pix_fmt; for (i = 0; conversion_map[i].fmt; i++) if (conversion_map[i].fmt == fmt) break; pix_fmt = conversion_map[i].pix_fmt; if (pix_fmt == PIX_FMT_NONE) mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported format %s\n", vo_format_name(fmt)); return pix_fmt; } int pixfmt2imgfmt(enum PixelFormat pix_fmt) { int i; int fmt; for (i = 0; conversion_map[i].pix_fmt != PIX_FMT_NONE; i++) if (conversion_map[i].pix_fmt == pix_fmt) break; fmt = conversion_map[i].fmt; if (!fmt) mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported PixelFormat %i\n", pix_fmt); return fmt; } static const struct { int fmt; enum AVSampleFormat sample_fmt; } samplefmt_conversion_map[] = { {AF_FORMAT_U8, AV_SAMPLE_FMT_U8}, {AF_FORMAT_S16_NE, AV_SAMPLE_FMT_S16}, {AF_FORMAT_S32_NE, AV_SAMPLE_FMT_S32}, {AF_FORMAT_FLOAT_NE, AV_SAMPLE_FMT_FLT}, {0, AV_SAMPLE_FMT_NONE} }; enum AVSampleFormat affmt2samplefmt(int fmt) { char str[50]; int i; enum AVSampleFormat sample_fmt; for (i = 0; samplefmt_conversion_map[i].fmt; i++) if (samplefmt_conversion_map[i].fmt == fmt) break; sample_fmt = samplefmt_conversion_map[i].sample_fmt; if (sample_fmt == AV_SAMPLE_FMT_NONE) mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported format %s\n", af_fmt2str(fmt, str, sizeof(str))); return sample_fmt; } int samplefmt2affmt(enum AVSampleFormat sample_fmt) { int i; int fmt; for (i = 0; samplefmt_conversion_map[i].sample_fmt != AV_SAMPLE_FMT_NONE; i++) if (samplefmt_conversion_map[i].sample_fmt == sample_fmt) break; fmt = samplefmt_conversion_map[i].fmt; if (!fmt) mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVSampleFormat %i\n", sample_fmt); return fmt; }