[MPlayer-cvslog] r34116 - in trunk: codec-cfg.c fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/mp_image.c libmpcodecs/vf_scale.c m_option.c

[cehoyos]

Author: cehoyos
Date: Wed Sep 21 03:32:43 2011
New Revision: 34116

Log:
Add 444P10 support.

Modified:
   trunk/codec-cfg.c
   trunk/fmt-conversion.c
   trunk/libmpcodecs/img_format.c
   trunk/libmpcodecs/img_format.h
   trunk/libmpcodecs/mp_image.c
   trunk/libmpcodecs/vf_scale.c
   trunk/m_option.c

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/codec-cfg.c	Wed Sep 21 03:32:43 2011	(r34116)
@@ -171,11 +171,14 @@ static const struct {
     {"IF09",  IMGFMT_IF09},
     {"444P16LE", IMGFMT_444P16_LE},
     {"444P16BE", IMGFMT_444P16_BE},
+    {"444P10LE", IMGFMT_444P10_LE},
+    {"444P10BE", IMGFMT_444P10_BE},
     {"422P16LE", IMGFMT_422P16_LE},
     {"422P16BE", IMGFMT_422P16_BE},
     {"420P16LE", IMGFMT_420P16_LE},
     {"420P16BE", IMGFMT_420P16_BE},
     {"444P16", IMGFMT_444P16},
+    {"444P10", IMGFMT_444P10},
     {"422P16", IMGFMT_422P16},
     {"422P10", IMGFMT_422P10},
     {"420P16", IMGFMT_420P16},

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/fmt-conversion.c	Wed Sep 21 03:32:43 2011	(r34116)
@@ -87,6 +87,8 @@ static const struct {
     {IMGFMT_422P10_BE,  PIX_FMT_YUV422P10BE},
     {IMGFMT_444P16_LE,  PIX_FMT_YUV444P16LE},
     {IMGFMT_444P16_BE,  PIX_FMT_YUV444P16BE},
+    {IMGFMT_444P10_LE,  PIX_FMT_YUV444P10LE},
+    {IMGFMT_444P10_BE,  PIX_FMT_YUV444P10BE},
 
     // YUVJ are YUV formats that use the full Y range and not just
     // 16 - 235 (see colorspaces.txt).

Modified: trunk/libmpcodecs/img_format.c
==============================================================================
--- trunk/libmpcodecs/img_format.c	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/libmpcodecs/img_format.c	Wed Sep 21 03:32:43 2011	(r34116)
@@ -70,6 +70,8 @@ const char *vo_format_name(int format)
     case IMGFMT_422P10_BE: return "Planar 422P 10-bit big-endian";
     case IMGFMT_444P16_LE: return "Planar 444P 16-bit little-endian";
     case IMGFMT_444P16_BE: return "Planar 444P 16-bit big-endian";
+    case IMGFMT_444P10_LE: return "Planar 444P 10-bit little-endian";
+    case IMGFMT_444P10_BE: return "Planar 444P 10-bit big-endian";
     case IMGFMT_420A: return "Planar 420P with alpha";
     case IMGFMT_444P: return "Planar 444P";
     case IMGFMT_422P: return "Planar 422P";

Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/libmpcodecs/img_format.h	Wed Sep 21 03:32:43 2011	(r34116)
@@ -123,6 +123,8 @@
 
 #define IMGFMT_444P16_LE 0x51343434
 #define IMGFMT_444P16_BE 0x34343451
+#define IMGFMT_444P10_LE 0x52343434
+#define IMGFMT_444P10_BE 0x34343452
 #define IMGFMT_422P16_LE 0x51323234
 #define IMGFMT_422P16_BE 0x34323251
 #define IMGFMT_422P10_LE 0x52323234
@@ -135,6 +137,7 @@
 #define IMGFMT_420P9_BE 0x34323053
 #if HAVE_BIGENDIAN
 #define IMGFMT_444P16 IMGFMT_444P16_BE
+#define IMGFMT_444P10 IMGFMT_444P10_BE
 #define IMGFMT_422P16 IMGFMT_422P16_BE
 #define IMGFMT_422P10 IMGFMT_422P10_BE
 #define IMGFMT_420P16 IMGFMT_420P16_BE
@@ -143,6 +146,7 @@
 #define IMGFMT_IS_YUVP16_NE(fmt) IMGFMT_IS_YUVP16_BE(fmt)
 #else
 #define IMGFMT_444P16 IMGFMT_444P16_LE
+#define IMGFMT_444P10 IMGFMT_444P10_LE
 #define IMGFMT_422P16 IMGFMT_422P16_LE
 #define IMGFMT_422P10 IMGFMT_422P10_LE
 #define IMGFMT_420P16 IMGFMT_420P16_LE

Modified: trunk/libmpcodecs/mp_image.c
==============================================================================
--- trunk/libmpcodecs/mp_image.c	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/libmpcodecs/mp_image.c	Wed Sep 21 03:32:43 2011	(r34116)
@@ -145,6 +145,8 @@ void mp_image_setfmt(mp_image_t* mpi,uns
     case IMGFMT_440P:
     case IMGFMT_444P16_LE:
     case IMGFMT_444P16_BE:
+    case IMGFMT_444P10_LE:
+    case IMGFMT_444P10_BE:
     case IMGFMT_422P16_LE:
     case IMGFMT_422P16_BE:
     case IMGFMT_422P10_LE:

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/libmpcodecs/vf_scale.c	Wed Sep 21 03:32:43 2011	(r34116)
@@ -68,6 +68,8 @@ static const unsigned int outfmt_list[]=
     IMGFMT_444P,
     IMGFMT_444P16_LE,
     IMGFMT_444P16_BE,
+    IMGFMT_444P10_LE,
+    IMGFMT_444P10_BE,
     IMGFMT_422P,
     IMGFMT_422P16_LE,
     IMGFMT_422P16_BE,

Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c	Tue Sep 20 21:15:36 2011	(r34115)
+++ trunk/m_option.c	Wed Sep 21 03:32:43 2011	(r34116)
@@ -1052,6 +1052,8 @@ static struct {
 } mp_imgfmt_list[] = {
   {"444p16le", IMGFMT_444P16_LE},
   {"444p16be", IMGFMT_444P16_BE},
+  {"444p10le", IMGFMT_444P10_LE},
+  {"444p10be", IMGFMT_444P10_BE},
   {"422p16le", IMGFMT_422P16_LE},
   {"422p16be", IMGFMT_422P16_BE},
   {"422p10le", IMGFMT_422P10_LE},