[MPlayer-cvslog] r37783 - in trunk: codec-cfg.c fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/vf_scale.c m_option.c
rtogni
subversion at mplayerhq.hu
Sun Feb 21 01:50:57 CET 2016
Author: rtogni
Date: Sun Feb 21 01:50:57 2016
New Revision: 37783
Log:
Add support for YUV440P12, YUV440P10, and GBRP10 colorspaces
Modified:
trunk/codec-cfg.c
trunk/fmt-conversion.c
trunk/libmpcodecs/img_format.c
trunk/libmpcodecs/img_format.h
trunk/libmpcodecs/vf_scale.c
trunk/m_option.c
Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c Sun Feb 21 01:43:18 2016 (r37782)
+++ trunk/codec-cfg.c Sun Feb 21 01:50:57 2016 (r37783)
@@ -189,6 +189,8 @@ static const struct {
{"422P12", IMGFMT_422P12},
{"422P10", IMGFMT_422P10},
{"422P9", IMGFMT_422P9},
+ {"440P12", IMGFMT_440P12},
+ {"440P10", IMGFMT_440P10},
{"420P16", IMGFMT_420P16},
{"420P14", IMGFMT_420P14},
{"420P12", IMGFMT_420P12},
@@ -241,6 +243,7 @@ static const struct {
{"GBR24P", IMGFMT_GBR24P},
{"GBR12P", IMGFMT_GBR12P},
{"GBR14P", IMGFMT_GBR14P},
+ {"GBR10P", IMGFMT_GBR10P},
{"MPES", IMGFMT_MPEGPES},
{"ZRMJPEGNI", IMGFMT_ZRMJPEGNI},
Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c Sun Feb 21 01:43:18 2016 (r37782)
+++ trunk/fmt-conversion.c Sun Feb 21 01:50:57 2016 (r37783)
@@ -69,6 +69,8 @@ static const struct {
{ IMGFMT_422A, AV_PIX_FMT_YUVA422P },
{ IMGFMT_444A, AV_PIX_FMT_YUVA444P },
{ IMGFMT_GBR24P, AV_PIX_FMT_GBRP },
+ { IMGFMT_GBR10PLE, AV_PIX_FMT_GBRP10LE },
+ { IMGFMT_GBR10PBE, AV_PIX_FMT_GBRP10BE },
{ IMGFMT_GBR12PLE, AV_PIX_FMT_GBRP12LE },
{ IMGFMT_GBR12PBE, AV_PIX_FMT_GBRP12BE },
{ IMGFMT_GBR14PLE, AV_PIX_FMT_GBRP14LE },
@@ -77,6 +79,8 @@ static const struct {
{ IMGFMT_420P14_BE, AV_PIX_FMT_YUV420P14BE },
{ IMGFMT_420P12_LE, AV_PIX_FMT_YUV420P12LE },
{ IMGFMT_420P12_BE, AV_PIX_FMT_YUV420P12BE },
+ { IMGFMT_440P12_LE, AV_PIX_FMT_YUV440P12LE },
+ { IMGFMT_440P12_BE, AV_PIX_FMT_YUV440P12BE },
{ IMGFMT_422P14_LE, AV_PIX_FMT_YUV422P14LE },
{ IMGFMT_422P14_BE, AV_PIX_FMT_YUV422P14BE },
{ IMGFMT_422P12_LE, AV_PIX_FMT_YUV422P12LE },
@@ -112,6 +116,8 @@ static const struct {
{ IMGFMT_420P10_BE, AV_PIX_FMT_YUV420P10BE },
{ IMGFMT_420P9_LE, AV_PIX_FMT_YUV420P9LE },
{ IMGFMT_420P9_BE, AV_PIX_FMT_YUV420P9BE },
+ { IMGFMT_440P10_LE, AV_PIX_FMT_YUV440P10LE },
+ { IMGFMT_440P10_BE, AV_PIX_FMT_YUV440P10BE },
{ IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE },
{ IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE },
{ IMGFMT_422P10_LE, AV_PIX_FMT_YUV422P10LE },
Modified: trunk/libmpcodecs/img_format.c
==============================================================================
--- trunk/libmpcodecs/img_format.c Sun Feb 21 01:43:18 2016 (r37782)
+++ trunk/libmpcodecs/img_format.c Sun Feb 21 01:50:57 2016 (r37783)
@@ -57,6 +57,7 @@ const char *vo_format_name(int format)
case IMGFMT_XYZ12LE: return "XYZ 36-bit LE";
case IMGFMT_XYZ12BE: return "XYZ 36-bit BE";
case IMGFMT_GBR24P: return "Planar GBR 24-bit";
+ case IMGFMT_GBR10P: return "Planar GBR 30-bit";
case IMGFMT_GBR12P: return "Planar GBR 36-bit";
case IMGFMT_GBR14P: return "Planar GBR 42-bit";
case IMGFMT_YVU9: return "Planar YVU9";
@@ -80,6 +81,10 @@ const char *vo_format_name(int format)
case IMGFMT_420P10_BE: return "Planar 420P 10-bit big-endian";
case IMGFMT_420P9_LE: return "Planar 420P 9-bit little-endian";
case IMGFMT_420P9_BE: return "Planar 420P 9-bit big-endian";
+ case IMGFMT_440P12_LE: return "Planar 440P 12-bit little-endian";
+ case IMGFMT_440P12_BE: return "Planar 440P 12-bit big-endian";
+ case IMGFMT_440P10_LE: return "Planar 440P 10-bit little-endian";
+ case IMGFMT_440P10_BE: return "Planar 440P 10-bit big-endian";
case IMGFMT_422P16_LE: return "Planar 422P 16-bit little-endian";
case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian";
case IMGFMT_422P14_LE: return "Planar 422P 14-bit little-endian";
Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h Sun Feb 21 01:43:18 2016 (r37782)
+++ trunk/libmpcodecs/img_format.h Sun Feb 21 01:50:57 2016 (r37783)
@@ -59,6 +59,8 @@
#define IMGFMT_XYZ12BE (IMGFMT_XYZ|12|128)
#define IMGFMT_GBR24P (('G'<<24)|('B'<<16)|('R'<<8)|24)
+#define IMGFMT_GBR10PLE (('G'<<24)|('B'<<16)|('R'<<8)|30)
+#define IMGFMT_GBR10PBE (('G'<<24)|('B'<<16)|('R'<<8)|30|128)
#define IMGFMT_GBR12PLE (('G'<<24)|('B'<<16)|('R'<<8)|36)
#define IMGFMT_GBR12PBE (('G'<<24)|('B'<<16)|('R'<<8)|36|128)
#define IMGFMT_GBR14PLE (('G'<<24)|('B'<<16)|('R'<<8)|42)
@@ -85,6 +87,7 @@
#define IMGFMT_BGR16BE IMGFMT_BGR16
#define IMGFMT_BGR16LE (IMGFMT_BGR16|128)
#define IMGFMT_XYZ12 IMGFMT_XYZ12BE
+#define IMGFMT_GBR10P IMGFMT_GBR10PBE
#define IMGFMT_GBR12P IMGFMT_GBR12PBE
#define IMGFMT_GBR14P IMGFMT_GBR14PBE
#else
@@ -108,6 +111,7 @@
#define IMGFMT_BGR16BE (IMGFMT_BGR16|128)
#define IMGFMT_BGR16LE IMGFMT_BGR16
#define IMGFMT_XYZ12 IMGFMT_XYZ12LE
+#define IMGFMT_GBR10P IMGFMT_GBR10PLE
#define IMGFMT_GBR12P IMGFMT_GBR12PLE
#define IMGFMT_GBR14P IMGFMT_GBR14PLE
#endif
@@ -176,6 +180,10 @@
#define IMGFMT_422P10_BE 0x34323252
#define IMGFMT_422P9_LE 0x53323234
#define IMGFMT_422P9_BE 0x34323253
+#define IMGFMT_440P12_LE 0x55303434
+#define IMGFMT_440P12_BE 0x34343055
+#define IMGFMT_440P10_LE 0x52303434
+#define IMGFMT_440P10_BE 0x34343052
#define IMGFMT_420P16_LE 0x51303234
#define IMGFMT_420P16_BE 0x34323051
#define IMGFMT_420P14_LE 0x54303234
@@ -197,6 +205,8 @@
#define IMGFMT_422P12 IMGFMT_422P12_BE
#define IMGFMT_422P10 IMGFMT_422P10_BE
#define IMGFMT_422P9 IMGFMT_422P9_BE
+#define IMGFMT_440P12 IMGFMT_440P12_BE
+#define IMGFMT_440P10 IMGFMT_440P10_BE
#define IMGFMT_420P16 IMGFMT_420P16_BE
#define IMGFMT_420P14 IMGFMT_420P14_BE
#define IMGFMT_420P12 IMGFMT_420P12_BE
@@ -215,6 +225,8 @@
#define IMGFMT_422P12 IMGFMT_422P12_LE
#define IMGFMT_422P10 IMGFMT_422P10_LE
#define IMGFMT_422P9 IMGFMT_422P9_LE
+#define IMGFMT_440P12 IMGFMT_440P12_LE
+#define IMGFMT_440P10 IMGFMT_440P10_LE
#define IMGFMT_420P16 IMGFMT_420P16_LE
#define IMGFMT_420P14 IMGFMT_420P14_LE
#define IMGFMT_420P12 IMGFMT_420P12_LE
Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c Sun Feb 21 01:43:18 2016 (r37782)
+++ trunk/libmpcodecs/vf_scale.c Sun Feb 21 01:50:57 2016 (r37783)
@@ -99,6 +99,10 @@ static const unsigned int outfmt_list[]=
IMGFMT_420P10_BE,
IMGFMT_420P9_LE,
IMGFMT_420P9_BE,
+ IMGFMT_440P12_LE,
+ IMGFMT_440P12_BE,
+ IMGFMT_440P10_LE,
+ IMGFMT_440P10_BE,
IMGFMT_420A,
IMGFMT_422A,
IMGFMT_444A,
@@ -117,6 +121,8 @@ static const unsigned int outfmt_list[]=
IMGFMT_BGR24,
IMGFMT_RGB24,
IMGFMT_GBR24P,
+ IMGFMT_GBR10PLE,
+ IMGFMT_GBR10PBE,
IMGFMT_GBR12PLE,
IMGFMT_GBR12PBE,
IMGFMT_GBR14PLE,
Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c Sun Feb 21 01:43:18 2016 (r37782)
+++ trunk/m_option.c Sun Feb 21 01:50:57 2016 (r37783)
@@ -1091,6 +1091,10 @@ static struct {
{"422p10be", IMGFMT_422P10_BE},
{"422p9le", IMGFMT_422P9_LE},
{"422p9be", IMGFMT_422P9_BE},
+ {"440p12le", IMGFMT_440P12_LE},
+ {"440p12be", IMGFMT_440P12_BE},
+ {"440p10le", IMGFMT_440P10_LE},
+ {"440p10be", IMGFMT_440P10_BE},
{"420p16le", IMGFMT_420P16_LE},
{"420p16be", IMGFMT_420P16_BE},
{"420p14le", IMGFMT_420P14_LE},
@@ -1166,6 +1170,8 @@ static struct {
{"gbr14ple", IMGFMT_GBR14PBE},
{"gbr12pbe", IMGFMT_GBR12PLE},
{"gbr12ple", IMGFMT_GBR12PBE},
+ {"gbr10pbe", IMGFMT_GBR10PLE},
+ {"gbr10ple", IMGFMT_GBR10PBE},
{"gbr24p", IMGFMT_GBR24P},
{"mjpeg", IMGFMT_MJPEG},
{"mjpg", IMGFMT_MJPEG},
More information about the MPlayer-cvslog
mailing list