RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 15:52:25 +00:00
Code Issues Releases Wiki Activity
c9b68957c9
mpv/video/fmt-conversion.c

209 lines
7.5 KiB
C
Raw Normal View History

Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
/*
* 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.
*/
fmt-conversion.c: print name of any unrecognized pixfmt Change the error message about unrecognized pixfmt values to include the symbolic name of the pixfmt (available from libavutil).
2011-06-25 22:04:53 +00:00
#include <libavutil/pixdesc.h>
Reduce recursive config.h inclusions in headers In my opinion, config.h inclusions should be kept to a minimum. MPlayer code really liked including config.h everywhere, though, even in often used header files. Try to reduce this.
2013-12-18 16:12:21 +00:00
#include <libavutil/avutil.h>
Rename directories, move files (step 2 of 2) Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.)
2012-11-09 00:06:43 +00:00
#include "video/img_format.h"
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
#include "fmt-conversion.h"
vda: Hwaccel 1.2 support Use the new context and the default functions provided.
2014-03-23 16:56:05 +00:00
#include "config.h"
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
static const struct {
int fmt;
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
enum AVPixelFormat pix_fmt;
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
} conversion_map[] = {
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_ARGB, AV_PIX_FMT_ARGB},
{IMGFMT_BGRA, AV_PIX_FMT_BGRA},
{IMGFMT_BGR24, AV_PIX_FMT_BGR24},
{IMGFMT_BGR16_BE, AV_PIX_FMT_RGB565BE},
{IMGFMT_BGR16_LE, AV_PIX_FMT_RGB565LE},
{IMGFMT_BGR15_BE, AV_PIX_FMT_RGB555BE},
{IMGFMT_BGR15_LE, AV_PIX_FMT_RGB555LE},
{IMGFMT_BGR12_BE, AV_PIX_FMT_RGB444BE},
{IMGFMT_BGR12_LE, AV_PIX_FMT_RGB444LE},
{IMGFMT_BGR8, AV_PIX_FMT_RGB8},
{IMGFMT_BGR4, AV_PIX_FMT_RGB4},
{IMGFMT_MONO, AV_PIX_FMT_MONOBLACK},
{IMGFMT_MONO_W, AV_PIX_FMT_MONOWHITE},
{IMGFMT_RGB4_BYTE, AV_PIX_FMT_BGR4_BYTE},
{IMGFMT_BGR4_BYTE, AV_PIX_FMT_RGB4_BYTE},
{IMGFMT_RGB48_LE, AV_PIX_FMT_RGB48LE},
{IMGFMT_RGB48_BE, AV_PIX_FMT_RGB48BE},
{IMGFMT_ABGR, AV_PIX_FMT_ABGR},
{IMGFMT_RGBA, AV_PIX_FMT_RGBA},
{IMGFMT_RGB24, AV_PIX_FMT_RGB24},
{IMGFMT_RGB16_BE, AV_PIX_FMT_BGR565BE},
{IMGFMT_RGB16_LE, AV_PIX_FMT_BGR565LE},
{IMGFMT_RGB15_BE, AV_PIX_FMT_BGR555BE},
{IMGFMT_RGB15_LE, AV_PIX_FMT_BGR555LE},
{IMGFMT_RGB12_BE, AV_PIX_FMT_BGR444BE},
{IMGFMT_RGB12_LE, AV_PIX_FMT_BGR444LE},
{IMGFMT_RGB8, AV_PIX_FMT_BGR8},
{IMGFMT_RGB4, AV_PIX_FMT_BGR4},
{IMGFMT_PAL8, AV_PIX_FMT_PAL8},
{IMGFMT_GBRP, AV_PIX_FMT_GBRP},
{IMGFMT_GBRP9_BE, AV_PIX_FMT_GBRP9BE},
{IMGFMT_GBRP9_LE, AV_PIX_FMT_GBRP9LE},
{IMGFMT_GBRP10_BE, AV_PIX_FMT_GBRP10BE},
{IMGFMT_GBRP10_LE, AV_PIX_FMT_GBRP10LE},
{IMGFMT_GBRP16_BE, AV_PIX_FMT_GBRP16BE},
{IMGFMT_GBRP16_LE, AV_PIX_FMT_GBRP16LE},
{IMGFMT_YUYV, AV_PIX_FMT_YUYV422},
{IMGFMT_UYVY, AV_PIX_FMT_UYVY422},
{IMGFMT_NV12, AV_PIX_FMT_NV12},
{IMGFMT_NV21, AV_PIX_FMT_NV21},
{IMGFMT_Y8, AV_PIX_FMT_GRAY8},
video: fix FFmpeg or Libav being a special snowflake
2014-03-16 15:23:12 +00:00
// FFmpeg prefers AV_PIX_FMT_GRAY8A, but Libav has only Y400A
{IMGFMT_YA8, AV_PIX_FMT_Y400A},
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_Y16_LE, AV_PIX_FMT_GRAY16LE},
{IMGFMT_Y16_BE, AV_PIX_FMT_GRAY16BE},
{IMGFMT_410P, AV_PIX_FMT_YUV410P},
{IMGFMT_420P, AV_PIX_FMT_YUV420P},
{IMGFMT_411P, AV_PIX_FMT_YUV411P},
{IMGFMT_422P, AV_PIX_FMT_YUV422P},
{IMGFMT_444P, AV_PIX_FMT_YUV444P},
{IMGFMT_440P, AV_PIX_FMT_YUV440P},
{IMGFMT_420P16_LE, AV_PIX_FMT_YUV420P16LE},
{IMGFMT_420P16_BE, AV_PIX_FMT_YUV420P16BE},
{IMGFMT_420P9_LE, AV_PIX_FMT_YUV420P9LE},
{IMGFMT_420P9_BE, AV_PIX_FMT_YUV420P9BE},
{IMGFMT_420P10_LE, AV_PIX_FMT_YUV420P10LE},
{IMGFMT_420P10_BE, AV_PIX_FMT_YUV420P10BE},
{IMGFMT_422P10_LE, AV_PIX_FMT_YUV422P10LE},
{IMGFMT_422P10_BE, AV_PIX_FMT_YUV422P10BE},
{IMGFMT_444P9_BE , AV_PIX_FMT_YUV444P9BE},
{IMGFMT_444P9_LE , AV_PIX_FMT_YUV444P9LE},
{IMGFMT_444P10_BE, AV_PIX_FMT_YUV444P10BE},
{IMGFMT_444P10_LE, AV_PIX_FMT_YUV444P10LE},
{IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE},
{IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE},
{IMGFMT_422P9_LE, AV_PIX_FMT_YUV422P9LE},
{IMGFMT_422P9_BE, AV_PIX_FMT_YUV422P9BE},
{IMGFMT_444P16_LE, AV_PIX_FMT_YUV444P16LE},
{IMGFMT_444P16_BE, AV_PIX_FMT_YUV444P16BE},
Re-add accidentally discarded comment about YUVJ format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28666 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 12:19:55 +00:00
video: decouple internal pixel formats from FourCCs mplayer's video chain traditionally used FourCCs for pixel formats. For example, it used IMGFMT_YV12 for 4:2:0 YUV, which was defined to the string 'YV12' interpreted as unsigned int. Additionally, it used to encode information into the numeric values of some formats. The RGB formats had their bit depth and endian encoded into the least significant byte. Extended planar formats (420P10 etc.) had chroma shift, endian, and component bit depth encoded. (This has been removed in recent commits.) Replace the FourCC mess with a simple enum. Remove all the redundant formats like YV12/I420/IYUV. Replace some image format names by something more intuitive, most importantly IMGFMT_YV12 -> IMGFMT_420P. Add img_fourcc.h, which contains the old IDs for code that actually uses FourCCs. Change the way demuxers, that output raw video, identify the video format: they set either MP_FOURCC_RAWVIDEO or MP_FOURCC_IMGFMT to request the rawvideo decoder, and sh_video->imgfmt specifies the pixel format. Like the previous hack, this is supposed to avoid the need for a complete codecs.cfg entry per format, or other lookup tables. (Note that the RGB raw video FourCCs mostly rely on ffmpeg's mappings for NUT raw video, but this is still considered better than adding a raw video decoder - even if trivial, it would be full of annoying lookup tables.) The TV code has not been tested. Some corrective changes regarding endian and other image format flags creep in.
2012-12-23 19:03:30 +00:00
// YUVJ are YUV formats that use the full Y range. Decoder color range
// information is used instead. Deprecated in ffmpeg.
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_420P, AV_PIX_FMT_YUVJ420P},
{IMGFMT_422P, AV_PIX_FMT_YUVJ422P},
{IMGFMT_444P, AV_PIX_FMT_YUVJ444P},
{IMGFMT_440P, AV_PIX_FMT_YUVJ440P},
Re-add accidentally discarded comment about YUVJ format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28666 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 12:19:55 +00:00
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_420AP, AV_PIX_FMT_YUVA420P},
imgfmt: add more ffmpeg pixel formats Most of these probably don't have much actual use, but at least allow images of these formats to be handed to swscale, should any decoder output them.
2012-12-26 23:58:45 +00:00
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_422AP, AV_PIX_FMT_YUVA422P},
{IMGFMT_444AP, AV_PIX_FMT_YUVA444P},
imgfmt: add more ffmpeg pixel formats Most of these probably don't have much actual use, but at least allow images of these formats to be handed to swscale, should any decoder output them.
2012-12-26 23:58:45 +00:00
{IMGFMT_420AP9_BE, AV_PIX_FMT_YUVA420P9BE},
{IMGFMT_420AP9_LE, AV_PIX_FMT_YUVA420P9LE},
{IMGFMT_420AP10_BE, AV_PIX_FMT_YUVA420P10BE},
{IMGFMT_420AP10_LE, AV_PIX_FMT_YUVA420P10LE},
{IMGFMT_420AP16_BE, AV_PIX_FMT_YUVA420P16BE},
{IMGFMT_420AP16_LE, AV_PIX_FMT_YUVA420P16LE},
{IMGFMT_422AP9_BE, AV_PIX_FMT_YUVA422P9BE},
{IMGFMT_422AP9_LE, AV_PIX_FMT_YUVA422P9LE},
{IMGFMT_422AP10_BE, AV_PIX_FMT_YUVA422P10BE},
{IMGFMT_422AP10_LE, AV_PIX_FMT_YUVA422P10LE},
{IMGFMT_422AP16_BE, AV_PIX_FMT_YUVA422P16BE},
{IMGFMT_422AP16_LE, AV_PIX_FMT_YUVA422P16LE},
{IMGFMT_444AP9_BE, AV_PIX_FMT_YUVA444P9BE},
{IMGFMT_444AP9_LE, AV_PIX_FMT_YUVA444P9LE},
{IMGFMT_444AP10_BE, AV_PIX_FMT_YUVA444P10BE},
{IMGFMT_444AP10_LE, AV_PIX_FMT_YUVA444P10LE},
{IMGFMT_444AP16_BE, AV_PIX_FMT_YUVA444P16BE},
{IMGFMT_444AP16_LE, AV_PIX_FMT_YUVA444P16LE},
video: add XYZ support Needed for the ffmpeg j2k decoder.
2013-05-01 14:16:03 +00:00
{IMGFMT_XYZ12_LE, AV_PIX_FMT_XYZ12LE},
{IMGFMT_XYZ12_BE, AV_PIX_FMT_XYZ12BE},
fmt-conversion: guard ffmpeg-only pixel format This should fix compilation with libav.
2012-10-30 18:32:30 +00:00
// ffmpeg only
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
#if LIBAVUTIL_VERSION_MICRO >= 100
{IMGFMT_420P12_LE, AV_PIX_FMT_YUV420P12LE},
{IMGFMT_420P12_BE, AV_PIX_FMT_YUV420P12BE},
{IMGFMT_420P14_LE, AV_PIX_FMT_YUV420P14LE},
{IMGFMT_420P14_BE, AV_PIX_FMT_YUV420P14BE},
{IMGFMT_422P12_LE, AV_PIX_FMT_YUV422P12LE},
{IMGFMT_422P12_BE, AV_PIX_FMT_YUV422P12BE},
{IMGFMT_422P14_LE, AV_PIX_FMT_YUV422P14LE},
{IMGFMT_422P14_BE, AV_PIX_FMT_YUV422P14BE},
{IMGFMT_444P12_BE, AV_PIX_FMT_YUV444P12BE},
{IMGFMT_444P12_LE, AV_PIX_FMT_YUV444P12LE},
{IMGFMT_444P14_BE, AV_PIX_FMT_YUV444P14BE},
{IMGFMT_444P14_LE, AV_PIX_FMT_YUV444P14LE},
{IMGFMT_GBRP12_BE, AV_PIX_FMT_GBRP12BE},
{IMGFMT_GBRP12_LE, AV_PIX_FMT_GBRP12LE},
{IMGFMT_GBRP14_BE, AV_PIX_FMT_GBRP14BE},
{IMGFMT_GBRP14_LE, AV_PIX_FMT_GBRP14LE},
{IMGFMT_RGBA64_BE, AV_PIX_FMT_RGBA64BE},
{IMGFMT_RGBA64_LE, AV_PIX_FMT_RGBA64LE},
{IMGFMT_BGRA64_BE, AV_PIX_FMT_BGRA64BE},
{IMGFMT_BGRA64_LE, AV_PIX_FMT_BGRA64LE},
{IMGFMT_BGR0, AV_PIX_FMT_BGR0},
{IMGFMT_0RGB, AV_PIX_FMT_0RGB},
{IMGFMT_RGB0, AV_PIX_FMT_RGB0},
{IMGFMT_0BGR, AV_PIX_FMT_0BGR},
{IMGFMT_BGR0, AV_PIX_FMT_BGR0},
video: make IMGFMT_RGB0 etc. exist even if libavutil doesn't support it These formats are helpful for distinguishing surfaces with and without alpha. Unfortunately, Libav and older version of FFmpeg don't support them, so code will break. Fix this by treating these formats specially on the mpv side, mapping them to RGBA on Libav, and unseting the alpha bit in the mp_imgfmt_desc struct.
2013-11-05 20:59:26 +00:00
#else
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_BGR0, AV_PIX_FMT_BGRA},
{IMGFMT_0RGB, AV_PIX_FMT_ARGB},
{IMGFMT_RGB0, AV_PIX_FMT_RGBA},
{IMGFMT_0BGR, AV_PIX_FMT_ABGR},
{IMGFMT_BGR0, AV_PIX_FMT_BGRA},
fmt-conversion: guard ffmpeg-only pixel format This should fix compilation with libav.
2012-10-30 18:32:30 +00:00
#endif
mp_image: add IMGFMT_BGR0/PIX_FMT_BGR0 Needed by ffv1.
2012-10-20 23:10:32 +00:00
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This file is named so because because it's written against the "old" libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau"). Add support for the "new" libavcodec vdpau support. This was recently added and replaces the "old" vdpau parts. (In fact, Libav is about to deprecate and remove the "old" API without deprecation grace period, so we have to support it now. Moreover, there will probably be no Libav release which supports both, so the transition is even less smooth than we could hope, and we have to support both the old and new API.) Whether the old or new API is used is checked by a configure test: if the new API is found, it is used, otherwise the old API is assumed. Some details might be handled differently. Especially display preemption is a bit problematic with the "new" libavcodec vdpau support: it wants to keep a pointer to a specific vdpau API function (which can be driver specific, because preemption might switch drivers). Also, surface IDs are now directly stored in AVFrames (and mp_images), so they can't be forced to VDP_INVALID_HANDLE on preemption. (This changes even with older libavcodec versions, because mp_image always uses the newer representation to make vo_vdpau.c simpler.) Decoder initialization in the new code tries to deal with codec profiles, while the old code always uses the highest profile per codec. Surface allocation changes. Since the decoder won't call config() in vo_vdpau.c on video size change anymore, we allow allocating surfaces of arbitrary size instead of locking it to what the VO was configured. The non-hwdec code also has slightly different allocation behavior now. Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau doesn't work anymore (a warning suggesting the --hwdec option is printed instead).
2013-07-27 23:49:45 +00:00
{IMGFMT_VDPAU, AV_PIX_FMT_VDPAU},
vda: Hwaccel 1.2 support Use the new context and the default functions provided.
2014-03-23 16:56:05 +00:00
#if HAVE_VDA_AV_VDA_ALLOC_CONTEXT
{IMGFMT_VDA, AV_PIX_FMT_VDA},
#else
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_VDA, AV_PIX_FMT_VDA_VLD},
vda: Hwaccel 1.2 support Use the new context and the default functions provided.
2014-03-23 16:56:05 +00:00
#endif
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD},
video: add vaapi decode and output support This is based on the MPlayer VA API patches. To be exact it's based on a very stripped down version of commit f1ad459a263f8537f6c from git://gitorious.org/vaapi/mplayer.git. This doesn't contain useless things like benchmarking hacks and the demo code for GLX interop. Also, unlike in the original patch, decoding and video output are split into separate source files (the separation between decoding and display also makes pixel format hacks unnecessary). On the other hand, some features not present in the original patch were added, like screenshot support. VA API is rather bad for actual video output. Dealing with older libva versions or the completely broken vdpau backend doesn't help. OSD is low quality and should be rather slow. In some cases, only either OSD or subtitles can be shown at the same time (because OSD is drawn first, OSD is prefered). Also, libva can't decide whether it accepts straight or premultiplied alpha for OSD sub-pictures: the vdpau backend seems to assume premultiplied, while a native vaapi driver uses straight. So I picked straight alpha. It doesn't matter much, because the blending code for straight alpha I added to img_convert.c is probably buggy, and ASS subtitles might be blended incorrectly. Really good video output with VA API would probably use OpenGL and the GL interop features, but at this point you might just use vo_opengl. (Patches for making HW decoding with vo_opengl have a chance of being accepted.) Despite these issues, decoding seems to work ok. I still got tearing on the Intel system I tested (Intel(R) Core(TM) i3-2350M). It was also tested with the vdpau vaapi wrapper on a nvidia system; however this was rather broken. (Fortunately, there is no reason to use mpv's VAAPI support over native VDPAU.)
2013-08-09 12:01:30 +00:00
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
{0, AV_PIX_FMT_NONE}
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
};
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
enum AVPixelFormat imgfmt2pixfmt(int fmt)
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
{
options: also accept ffmpeg pixel format names Options that take pixel format names now also accept ffmpeg names. mpv internal names are preferred. We leave this undocumented intentionally, and may be removed once libswscale stops printing ffmpeg pixel format names to the terminal (or if we stop passing the SWS_PRINT_INFO flag to it, which makes it print these). (We insist on keeping the mpv specific names instead of dropping them in favor of ffmpeg's name due to NIH, and also because ffmpeg always appends the endian suffixes "le" and "be".)
2013-01-17 15:10:26 +00:00
if (fmt == IMGFMT_NONE)
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
return AV_PIX_FMT_NONE;
options: also accept ffmpeg pixel format names Options that take pixel format names now also accept ffmpeg names. mpv internal names are preferred. We leave this undocumented intentionally, and may be removed once libswscale stops printing ffmpeg pixel format names to the terminal (or if we stop passing the SWS_PRINT_INFO flag to it, which makes it print these). (We insist on keeping the mpv specific names instead of dropping them in favor of ffmpeg's name due to NIH, and also because ffmpeg always appends the endian suffixes "le" and "be".)
2013-01-17 15:10:26 +00:00
video/fmt-conversion.c: remove unknown pixel format messages This removes the messages printed on unknown pixel format messages. Passing a mp_log to them would be too messy. Actually, this is a good change, because in the past we often had trouble with these messages printed too often (causing terminal spam etc.), and printing warnings or error messages on the caller sides is much cleaner. vd_lavc.c had a change earlier to print an error message if a decoder outputs an unsupported pixel format.
2013-12-21 17:04:16 +00:00
for (int i = 0; conversion_map[i].fmt; i++) {
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
if (conversion_map[i].fmt == fmt)
video/fmt-conversion.c: remove unknown pixel format messages This removes the messages printed on unknown pixel format messages. Passing a mp_log to them would be too messy. Actually, this is a good change, because in the past we often had trouble with these messages printed too often (causing terminal spam etc.), and printing warnings or error messages on the caller sides is much cleaner. vd_lavc.c had a change earlier to print an error message if a decoder outputs an unsupported pixel format.
2013-12-21 17:04:16 +00:00
return conversion_map[i].pix_fmt;
}
return AV_PIX_FMT_NONE;
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
}
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
int pixfmt2imgfmt(enum AVPixelFormat pix_fmt)
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
{
Take care of some libavutil deprecations, drop support for FFmpeg 1.0 PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
2013-11-29 16:39:57 +00:00
if (pix_fmt == AV_PIX_FMT_NONE)
options: also accept ffmpeg pixel format names Options that take pixel format names now also accept ffmpeg names. mpv internal names are preferred. We leave this undocumented intentionally, and may be removed once libswscale stops printing ffmpeg pixel format names to the terminal (or if we stop passing the SWS_PRINT_INFO flag to it, which makes it print these). (We insist on keeping the mpv specific names instead of dropping them in favor of ffmpeg's name due to NIH, and also because ffmpeg always appends the endian suffixes "le" and "be".)
2013-01-17 15:10:26 +00:00
return IMGFMT_NONE;
video/fmt-conversion.c: remove unknown pixel format messages This removes the messages printed on unknown pixel format messages. Passing a mp_log to them would be too messy. Actually, this is a good change, because in the past we often had trouble with these messages printed too often (causing terminal spam etc.), and printing warnings or error messages on the caller sides is much cleaner. vd_lavc.c had a change earlier to print an error message if a decoder outputs an unsupported pixel format.
2013-12-21 17:04:16 +00:00
for (int i = 0; conversion_map[i].pix_fmt != AV_PIX_FMT_NONE; i++) {
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
if (conversion_map[i].pix_fmt == pix_fmt)
video/fmt-conversion.c: remove unknown pixel format messages This removes the messages printed on unknown pixel format messages. Passing a mp_log to them would be too messy. Actually, this is a good change, because in the past we often had trouble with these messages printed too often (causing terminal spam etc.), and printing warnings or error messages on the caller sides is much cleaner. vd_lavc.c had a change earlier to print an error message if a decoder outputs an unsupported pixel format.
2013-12-21 17:04:16 +00:00
return conversion_map[i].fmt;
fmt-conversion.c: print name of any unrecognized pixfmt Change the error message about unrecognized pixfmt values to include the symbolic name of the pixfmt (available from libavutil).
2011-06-25 22:04:53 +00:00
}
video/fmt-conversion.c: remove unknown pixel format messages This removes the messages printed on unknown pixel format messages. Passing a mp_log to them would be too messy. Actually, this is a good change, because in the past we often had trouble with these messages printed too often (causing terminal spam etc.), and printing warnings or error messages on the caller sides is much cleaner. vd_lavc.c had a change earlier to print an error message if a decoder outputs an unsupported pixel format.
2013-12-21 17:04:16 +00:00
return 0;
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
}
Reference in New Issue Copy Permalink