summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-05 01:16:57 +0100
committerwm4 <wm4@nowhere>2014-11-05 01:52:20 +0100
commita7686e86fff0412454076756f333e2e271511166 (patch)
tree783751a6a63135ee798241ab63999d0000386dda /video
parentfce77c05f5585c623afc312635054eb23cc69c0b (diff)
downloadmpv-a7686e86fff0412454076756f333e2e271511166.tar.bz2
mpv-a7686e86fff0412454076756f333e2e271511166.tar.xz
video: remove swapped-endian image format aliases
Like the previous commit, this removes names only, not actual support for these formats.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_scale.c48
-rw-r--r--video/fmt-conversion.c80
-rw-r--r--video/image_writer.c2
-rw-r--r--video/img_format.c2
-rw-r--r--video/img_format.h116
5 files changed, 73 insertions, 175 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index eac1aa79a9..42c8c23df7 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -60,38 +60,23 @@ static struct vf_priv_s {
static const unsigned int outfmt_list[] = {
// YUV:
IMGFMT_444P,
- IMGFMT_444P16_LE,
- IMGFMT_444P16_BE,
- IMGFMT_444P14_LE,
- IMGFMT_444P14_BE,
- IMGFMT_444P12_LE,
- IMGFMT_444P12_BE,
- IMGFMT_444P10_LE,
- IMGFMT_444P10_BE,
- IMGFMT_444P9_LE,
- IMGFMT_444P9_BE,
+ IMGFMT_444P16,
+ IMGFMT_444P14,
+ IMGFMT_444P12,
+ IMGFMT_444P10,
+ IMGFMT_444P9,
IMGFMT_422P,
- IMGFMT_422P16_LE,
- IMGFMT_422P16_BE,
- IMGFMT_422P14_LE,
- IMGFMT_422P14_BE,
- IMGFMT_422P12_LE,
- IMGFMT_422P12_BE,
- IMGFMT_422P10_LE,
- IMGFMT_422P10_BE,
- IMGFMT_422P9_LE,
- IMGFMT_422P9_BE,
+ IMGFMT_422P16,
+ IMGFMT_422P14,
+ IMGFMT_422P12,
+ IMGFMT_422P10,
+ IMGFMT_422P9,
IMGFMT_420P,
- IMGFMT_420P16_LE,
- IMGFMT_420P16_BE,
- IMGFMT_420P14_LE,
- IMGFMT_420P14_BE,
- IMGFMT_420P12_LE,
- IMGFMT_420P12_BE,
- IMGFMT_420P10_LE,
- IMGFMT_420P10_BE,
- IMGFMT_420P9_LE,
- IMGFMT_420P9_BE,
+ IMGFMT_420P16,
+ IMGFMT_420P14,
+ IMGFMT_420P12,
+ IMGFMT_420P10,
+ IMGFMT_420P9,
IMGFMT_420AP,
IMGFMT_410P,
IMGFMT_411P,
@@ -110,8 +95,7 @@ static const unsigned int outfmt_list[] = {
IMGFMT_BGR24,
IMGFMT_RGB24,
IMGFMT_GBRP,
- IMGFMT_RGB48_LE,
- IMGFMT_RGB48_BE,
+ IMGFMT_RGB48,
IMGFMT_BGR565,
IMGFMT_RGB565,
IMGFMT_BGR555,
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index 09ff925577..eb6b31cc71 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -30,29 +30,22 @@ static const struct {
{IMGFMT_ARGB, AV_PIX_FMT_ARGB},
{IMGFMT_BGRA, AV_PIX_FMT_BGRA},
{IMGFMT_BGR24, AV_PIX_FMT_BGR24},
- {IMGFMT_RGB565_BE, AV_PIX_FMT_RGB565BE},
- {IMGFMT_RGB565_LE, AV_PIX_FMT_RGB565LE},
- {IMGFMT_RGB555_BE, AV_PIX_FMT_RGB555BE},
- {IMGFMT_RGB555_LE, AV_PIX_FMT_RGB555LE},
- {IMGFMT_RGB444_BE, AV_PIX_FMT_RGB444BE},
- {IMGFMT_RGB444_LE, AV_PIX_FMT_RGB444LE},
+ {IMGFMT_RGB565, AV_PIX_FMT_RGB565},
+ {IMGFMT_RGB555, AV_PIX_FMT_RGB555},
+ {IMGFMT_RGB444, AV_PIX_FMT_RGB444},
{IMGFMT_RGB8, AV_PIX_FMT_RGB8},
{IMGFMT_RGB4, AV_PIX_FMT_RGB4},
{IMGFMT_MONO, AV_PIX_FMT_MONOBLACK},
{IMGFMT_MONO_W, AV_PIX_FMT_MONOWHITE},
{IMGFMT_RGB4_BYTE, AV_PIX_FMT_RGB4_BYTE},
{IMGFMT_BGR4_BYTE, AV_PIX_FMT_BGR4_BYTE},
- {IMGFMT_RGB48_LE, AV_PIX_FMT_RGB48LE},
- {IMGFMT_RGB48_BE, AV_PIX_FMT_RGB48BE},
+ {IMGFMT_RGB48, AV_PIX_FMT_RGB48},
{IMGFMT_ABGR, AV_PIX_FMT_ABGR},
{IMGFMT_RGBA, AV_PIX_FMT_RGBA},
{IMGFMT_RGB24, AV_PIX_FMT_RGB24},
- {IMGFMT_BGR565_BE, AV_PIX_FMT_BGR565BE},
- {IMGFMT_BGR565_LE, AV_PIX_FMT_BGR565LE},
- {IMGFMT_BGR555_BE, AV_PIX_FMT_BGR555BE},
- {IMGFMT_BGR555_LE, AV_PIX_FMT_BGR555LE},
- {IMGFMT_BGR444_BE, AV_PIX_FMT_BGR444BE},
- {IMGFMT_BGR444_LE, AV_PIX_FMT_BGR444LE},
+ {IMGFMT_BGR565, AV_PIX_FMT_BGR565},
+ {IMGFMT_BGR555, AV_PIX_FMT_BGR555},
+ {IMGFMT_BGR444, AV_PIX_FMT_BGR444},
{IMGFMT_BGR8, AV_PIX_FMT_BGR8},
{IMGFMT_BGR4, AV_PIX_FMT_BGR4},
{IMGFMT_PAL8, AV_PIX_FMT_PAL8},
@@ -64,8 +57,7 @@ static const struct {
{IMGFMT_Y8, AV_PIX_FMT_GRAY8},
// FFmpeg prefers AV_PIX_FMT_GRAY8A, but Libav has only Y400A
{IMGFMT_YA8, AV_PIX_FMT_Y400A},
- {IMGFMT_Y16_LE, AV_PIX_FMT_GRAY16LE},
- {IMGFMT_Y16_BE, AV_PIX_FMT_GRAY16BE},
+ {IMGFMT_Y16, AV_PIX_FMT_GRAY16},
{IMGFMT_410P, AV_PIX_FMT_YUV410P},
{IMGFMT_420P, AV_PIX_FMT_YUV420P},
{IMGFMT_411P, AV_PIX_FMT_YUV411P},
@@ -73,24 +65,15 @@ static const struct {
{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},
+ {IMGFMT_420P16, AV_PIX_FMT_YUV420P16},
+ {IMGFMT_420P9, AV_PIX_FMT_YUV420P9},
+ {IMGFMT_420P10, AV_PIX_FMT_YUV420P10},
+ {IMGFMT_422P10, AV_PIX_FMT_YUV422P10},
+ {IMGFMT_444P9, AV_PIX_FMT_YUV444P9},
+ {IMGFMT_444P10, AV_PIX_FMT_YUV444P10},
+ {IMGFMT_422P16, AV_PIX_FMT_YUV422P16},
+ {IMGFMT_422P9, AV_PIX_FMT_YUV422P9},
+ {IMGFMT_444P16, AV_PIX_FMT_YUV444P16},
// YUVJ are YUV formats that use the full Y range. Decoder color range
// information is used instead. Deprecated in ffmpeg.
@@ -103,28 +86,19 @@ static const struct {
{IMGFMT_422AP, AV_PIX_FMT_YUVA422P},
{IMGFMT_444AP, AV_PIX_FMT_YUVA444P},
- {IMGFMT_XYZ12_LE, AV_PIX_FMT_XYZ12LE},
- {IMGFMT_XYZ12_BE, AV_PIX_FMT_XYZ12BE},
+ {IMGFMT_XYZ12, AV_PIX_FMT_XYZ12},
// ffmpeg only
#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_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_420P12, AV_PIX_FMT_YUV420P12},
+ {IMGFMT_420P14, AV_PIX_FMT_YUV420P14},
+ {IMGFMT_422P12, AV_PIX_FMT_YUV422P12},
+ {IMGFMT_422P14, AV_PIX_FMT_YUV422P14},
+ {IMGFMT_444P12, AV_PIX_FMT_YUV444P12},
+ {IMGFMT_444P14, AV_PIX_FMT_YUV444P14},
+
+ {IMGFMT_RGBA64, AV_PIX_FMT_RGBA64},
+ {IMGFMT_BGRA64, AV_PIX_FMT_BGRA64},
{IMGFMT_BGR0, AV_PIX_FMT_BGR0},
{IMGFMT_0RGB, AV_PIX_FMT_0RGB},
diff --git a/video/image_writer.c b/video/image_writer.c
index 122379f725..e8f10978cd 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -225,7 +225,7 @@ static const struct img_writer img_writers[] = {
},
{ "tga", write_lavc,
.lavc_codec = AV_CODEC_ID_TARGA,
- .pixfmts = (const int[]) { IMGFMT_BGR24, IMGFMT_BGRA, IMGFMT_RGB555_LE,
+ .pixfmts = (const int[]) { IMGFMT_BGR24, IMGFMT_BGRA, IMGFMT_RGB555,
IMGFMT_Y8, 0},
},
#if HAVE_JPEG
diff --git a/video/img_format.c b/video/img_format.c
index b1d78feba1..7df0923cfe 100644
--- a/video/img_format.c
+++ b/video/img_format.c
@@ -185,7 +185,7 @@ struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt)
? MP_IMGFLAG_BE : MP_IMGFLAG_LE;
}
- if (mpfmt == IMGFMT_XYZ12_LE || mpfmt == IMGFMT_XYZ12_BE) {
+ if (fmt == AV_PIX_FMT_XYZ12LE || fmt == AV_PIX_FMT_XYZ12BE) {
desc.flags |= MP_IMGFLAG_XYZ;
} else if (!(pd->flags & AV_PIX_FMT_FLAG_RGB) &&
fmt != AV_PIX_FMT_MONOBLACK &&
diff --git a/video/img_format.h b/video/img_format.h
index 17062bbf68..d9da81f2f9 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -106,38 +106,23 @@ enum mp_imgfmt {
// YUV formats with 2 bytes per plane-pixel. Formats with 9-15 bits pad the
// most significant bits with 0 (use shifts to expand them to 16 bits).
- IMGFMT_444P16_LE,
- IMGFMT_444P16_BE,
- IMGFMT_444P14_LE,
- IMGFMT_444P14_BE,
- IMGFMT_444P12_LE,
- IMGFMT_444P12_BE,
- IMGFMT_444P10_LE,
- IMGFMT_444P10_BE,
- IMGFMT_444P9_LE,
- IMGFMT_444P9_BE,
-
- IMGFMT_422P16_LE,
- IMGFMT_422P16_BE,
- IMGFMT_422P14_LE,
- IMGFMT_422P14_BE,
- IMGFMT_422P12_LE,
- IMGFMT_422P12_BE,
- IMGFMT_422P10_LE,
- IMGFMT_422P10_BE,
- IMGFMT_422P9_LE,
- IMGFMT_422P9_BE,
-
- IMGFMT_420P16_LE,
- IMGFMT_420P16_BE,
- IMGFMT_420P14_LE,
- IMGFMT_420P14_BE,
- IMGFMT_420P12_LE,
- IMGFMT_420P12_BE,
- IMGFMT_420P10_LE,
- IMGFMT_420P10_BE,
- IMGFMT_420P9_LE,
- IMGFMT_420P9_BE,
+ IMGFMT_444P16,
+ IMGFMT_444P14,
+ IMGFMT_444P12,
+ IMGFMT_444P10,
+ IMGFMT_444P9,
+
+ IMGFMT_422P16,
+ IMGFMT_422P14,
+ IMGFMT_422P12,
+ IMGFMT_422P10,
+ IMGFMT_422P9,
+
+ IMGFMT_420P16,
+ IMGFMT_420P14,
+ IMGFMT_420P12,
+ IMGFMT_420P10,
+ IMGFMT_420P9,
// Planar YUV with alpha (4th plane)
IMGFMT_444AP,
@@ -146,8 +131,7 @@ enum mp_imgfmt {
// Gray
IMGFMT_Y8,
- IMGFMT_Y16_LE,
- IMGFMT_Y16_BE,
+ IMGFMT_Y16,
// Gray with alpha (packed)
IMGFMT_YA8,
@@ -169,12 +153,9 @@ enum mp_imgfmt {
IMGFMT_RGBA,
IMGFMT_BGR24, // 3 bytes per pixel
IMGFMT_RGB24,
- IMGFMT_RGB48_LE, // 6 bytes per pixel, uint16_t channels
- IMGFMT_RGB48_BE,
- IMGFMT_RGBA64_LE, // 8 bytes per pixel, uint16_t channels
- IMGFMT_RGBA64_BE,
- IMGFMT_BGRA64_LE,
- IMGFMT_BGRA64_BE,
+ IMGFMT_RGB48, // 6 bytes per pixel, uint16_t channels
+ IMGFMT_RGBA64, // 8 bytes per pixel, uint16_t channels
+ IMGFMT_BGRA64,
// Like e.g. IMGFMT_ARGB, but has a padding byte instead of alpha
IMGFMT_0RGB,
@@ -196,18 +177,12 @@ enum mp_imgfmt {
IMGFMT_MONO_W, // like IMGFMT_MONO, but inverted (white pixels)
// Accessed with bit-shifts after endian-swapping the uint16_t pixel
- IMGFMT_RGB444_LE, // 4r 4g 4b 4a (MSB to LSB)
- IMGFMT_RGB444_BE,
- IMGFMT_RGB555_LE, // 5r 5g 5b 1a
- IMGFMT_RGB555_BE,
- IMGFMT_RGB565_LE, // 5r 6g 5b
- IMGFMT_RGB565_BE,
- IMGFMT_BGR444_LE, // 4b 4r 4g 4a
- IMGFMT_BGR444_BE,
- IMGFMT_BGR555_LE, // 5b 5g 5r 1a
- IMGFMT_BGR555_BE,
- IMGFMT_BGR565_LE, // 5b 6g 5r
- IMGFMT_BGR565_BE,
+ IMGFMT_RGB444, // 4r 4g 4b 4a (MSB to LSB)
+ IMGFMT_RGB555, // 5r 5g 5b 1a
+ IMGFMT_RGB565, // 5r 6g 5b
+ IMGFMT_BGR444, // 4b 4r 4g 4a
+ IMGFMT_BGR555, // 5b 5g 5r 1a
+ IMGFMT_BGR565, // 5b 6g 5r
// The first plane has 1 byte per pixel. The second plane is a palette with
// 256 entries, with each entry encoded like in IMGFMT_BGR32.
@@ -218,8 +193,7 @@ enum mp_imgfmt {
// XYZ colorspace, similar organization to RGB48. Even though it says "12",
// the components are stored as 16 bit, with lower 4 bits set to 0.
- IMGFMT_XYZ12_LE,
- IMGFMT_XYZ12_BE,
+ IMGFMT_XYZ12,
// Hardware accelerated formats. Plane data points to special data
// structures, instead of pixel data.
@@ -237,8 +211,6 @@ enum mp_imgfmt {
IMGFMT_END,
// Redundant format aliases for native endian access
- // For all formats that have _LE/_BE, define a native-endian entry without
- // the suffix.
// The IMGFMT_RGB32 and IMGFMT_BGR32 formats provide bit-shift access to
// normally byte-accessed formats:
@@ -246,38 +218,6 @@ enum mp_imgfmt {
// IMGFMT_BGR32 = b | (g << 8) | (r << 16) | (a << 24)
IMGFMT_RGB32 = MP_SELECT_LE_BE(IMGFMT_RGBA, IMGFMT_ABGR),
IMGFMT_BGR32 = MP_SELECT_LE_BE(IMGFMT_BGRA, IMGFMT_ARGB),
-
- IMGFMT_RGB444 = MP_SELECT_LE_BE(IMGFMT_RGB444_LE, IMGFMT_RGB444_BE),
- IMGFMT_RGB555 = MP_SELECT_LE_BE(IMGFMT_RGB555_LE, IMGFMT_RGB555_BE),
- IMGFMT_RGB565 = MP_SELECT_LE_BE(IMGFMT_RGB565_LE, IMGFMT_RGB565_BE),
- IMGFMT_BGR444 = MP_SELECT_LE_BE(IMGFMT_BGR444_LE, IMGFMT_BGR444_BE),
- IMGFMT_BGR555 = MP_SELECT_LE_BE(IMGFMT_BGR555_LE, IMGFMT_BGR555_BE),
- IMGFMT_BGR565 = MP_SELECT_LE_BE(IMGFMT_BGR565_LE, IMGFMT_BGR565_BE),
- IMGFMT_RGB48 = MP_SELECT_LE_BE(IMGFMT_RGB48_LE, IMGFMT_RGB48_BE),
- IMGFMT_RGBA64 = MP_SELECT_LE_BE(IMGFMT_RGBA64_LE, IMGFMT_RGBA64_BE),
- IMGFMT_BGRA64 = MP_SELECT_LE_BE(IMGFMT_BGRA64_LE, IMGFMT_BGRA64_BE),
-
- IMGFMT_444P16 = MP_SELECT_LE_BE(IMGFMT_444P16_LE, IMGFMT_444P16_BE),
- IMGFMT_444P14 = MP_SELECT_LE_BE(IMGFMT_444P14_LE, IMGFMT_444P14_BE),
- IMGFMT_444P12 = MP_SELECT_LE_BE(IMGFMT_444P12_LE, IMGFMT_444P12_BE),
- IMGFMT_444P10 = MP_SELECT_LE_BE(IMGFMT_444P10_LE, IMGFMT_444P10_BE),
- IMGFMT_444P9 = MP_SELECT_LE_BE(IMGFMT_444P9_LE, IMGFMT_444P9_BE),
-
- IMGFMT_422P16 = MP_SELECT_LE_BE(IMGFMT_422P16_LE, IMGFMT_422P16_BE),
- IMGFMT_422P14 = MP_SELECT_LE_BE(IMGFMT_422P14_LE, IMGFMT_422P14_BE),
- IMGFMT_422P12 = MP_SELECT_LE_BE(IMGFMT_422P12_LE, IMGFMT_422P12_BE),
- IMGFMT_422P10 = MP_SELECT_LE_BE(IMGFMT_422P10_LE, IMGFMT_422P10_BE),
- IMGFMT_422P9 = MP_SELECT_LE_BE(IMGFMT_422P9_LE, IMGFMT_422P9_BE),
-
- IMGFMT_420P16 = MP_SELECT_LE_BE(IMGFMT_420P16_LE, IMGFMT_420P16_BE),
- IMGFMT_420P14 = MP_SELECT_LE_BE(IMGFMT_420P14_LE, IMGFMT_420P14_BE),
- IMGFMT_420P12 = MP_SELECT_LE_BE(IMGFMT_420P12_LE, IMGFMT_420P12_BE),
- IMGFMT_420P10 = MP_SELECT_LE_BE(IMGFMT_420P10_LE, IMGFMT_420P10_BE),
- IMGFMT_420P9 = MP_SELECT_LE_BE(IMGFMT_420P9_LE, IMGFMT_420P9_BE),
-
- IMGFMT_Y16 = MP_SELECT_LE_BE(IMGFMT_Y16_LE, IMGFMT_Y16_BE),
-
- IMGFMT_XYZ12 = MP_SELECT_LE_BE(IMGFMT_XYZ12_LE, IMGFMT_XYZ12_BE),
};
static inline bool IMGFMT_IS_RGB(int fmt)