[MPlayer-cvslog] r34277 - in trunk: codec-cfg.c etc/codecs.conf 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: Sat Oct 29 18:51:26 2011
New Revision: 34277

Log:
Support YUV 4:4:4 9-bit output.

Modified:
   trunk/codec-cfg.c
   trunk/etc/codecs.conf
   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	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/codec-cfg.c	Sat Oct 29 18:51:26 2011	(r34277)
@@ -179,6 +179,7 @@ static const struct {
     {"420P16BE", IMGFMT_420P16_BE},
     {"444P16", IMGFMT_444P16},
     {"444P10", IMGFMT_444P10},
+    {"444P9", IMGFMT_444P9},
     {"422P16", IMGFMT_422P16},
     {"422P10", IMGFMT_422P10},
     {"420P16", IMGFMT_420P16},

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/etc/codecs.conf	Sat Oct 29 18:51:26 2011	(r34277)
@@ -1114,7 +1114,7 @@ videocodec ffh264
   dll h264
   out YV12,I420,IYUV,420P10,420P9
   out 422P,422P10
-  out 444P,444P10
+  out 444P,444P9,444P10
   out GBR24P
 
 videocodec ffh264vdpau

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/fmt-conversion.c	Sat Oct 29 18:51:26 2011	(r34277)
@@ -90,6 +90,8 @@ static const struct {
     {IMGFMT_444P16_BE,  PIX_FMT_YUV444P16BE},
     {IMGFMT_444P10_LE,  PIX_FMT_YUV444P10LE},
     {IMGFMT_444P10_BE,  PIX_FMT_YUV444P10BE},
+    {IMGFMT_444P9_LE,  PIX_FMT_YUV444P9LE},
+    {IMGFMT_444P9_BE,  PIX_FMT_YUV444P9BE},
 
     // 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	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/libmpcodecs/img_format.c	Sat Oct 29 18:51:26 2011	(r34277)
@@ -73,6 +73,8 @@ const char *vo_format_name(int format)
     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_444P9_LE: return "Planar 444P 9-bit little-endian";
+    case IMGFMT_444P9_BE: return "Planar 444P 9-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	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/libmpcodecs/img_format.h	Sat Oct 29 18:51:26 2011	(r34277)
@@ -127,6 +127,8 @@
 #define IMGFMT_444P16_BE 0x34343451
 #define IMGFMT_444P10_LE 0x52343434
 #define IMGFMT_444P10_BE 0x34343452
+#define IMGFMT_444P9_LE 0x53343434
+#define IMGFMT_444P9_BE 0x34343453
 #define IMGFMT_422P16_LE 0x51323234
 #define IMGFMT_422P16_BE 0x34323251
 #define IMGFMT_422P10_LE 0x52323234
@@ -140,6 +142,7 @@
 #if HAVE_BIGENDIAN
 #define IMGFMT_444P16 IMGFMT_444P16_BE
 #define IMGFMT_444P10 IMGFMT_444P10_BE
+#define IMGFMT_444P9 IMGFMT_444P9_BE
 #define IMGFMT_422P16 IMGFMT_422P16_BE
 #define IMGFMT_422P10 IMGFMT_422P10_BE
 #define IMGFMT_420P16 IMGFMT_420P16_BE
@@ -149,6 +152,7 @@
 #else
 #define IMGFMT_444P16 IMGFMT_444P16_LE
 #define IMGFMT_444P10 IMGFMT_444P10_LE
+#define IMGFMT_444P9 IMGFMT_444P9_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	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/libmpcodecs/mp_image.c	Sat Oct 29 18:51:26 2011	(r34277)
@@ -152,6 +152,8 @@ void mp_image_setfmt(mp_image_t* mpi,uns
     case IMGFMT_444P16_BE:
     case IMGFMT_444P10_LE:
     case IMGFMT_444P10_BE:
+    case IMGFMT_444P9_LE:
+    case IMGFMT_444P9_BE:
     case IMGFMT_422P16_LE:
     case IMGFMT_422P16_BE:
     case IMGFMT_422P10_LE:

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/libmpcodecs/vf_scale.c	Sat Oct 29 18:51:26 2011	(r34277)
@@ -70,6 +70,8 @@ static const unsigned int outfmt_list[]=
     IMGFMT_444P16_BE,
     IMGFMT_444P10_LE,
     IMGFMT_444P10_BE,
+    IMGFMT_444P9_LE,
+    IMGFMT_444P9_BE,
     IMGFMT_422P,
     IMGFMT_422P16_LE,
     IMGFMT_422P16_BE,

Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c	Sat Oct 29 12:01:32 2011	(r34276)
+++ trunk/m_option.c	Sat Oct 29 18:51:26 2011	(r34277)
@@ -1078,6 +1078,8 @@ static struct {
   {"444p16be", IMGFMT_444P16_BE},
   {"444p10le", IMGFMT_444P10_LE},
   {"444p10be", IMGFMT_444P10_BE},
+  {"444p9le", IMGFMT_444P9_LE},
+  {"444p9be", IMGFMT_444P9_BE},
   {"422p16le", IMGFMT_422P16_LE},
   {"422p16be", IMGFMT_422P16_BE},
   {"422p10le", IMGFMT_422P10_LE},