[MPlayer-cvslog] r34524 - 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

[reimar]

Author: reimar
Date: Thu Jan  5 21:32:10 2012
New Revision: 34524

Log:
Add support for 422P9.

For some reason only 9-bit 422 wasn't added before.

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	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/codec-cfg.c	Thu Jan  5 21:32:10 2012	(r34524)
@@ -182,6 +182,7 @@ static const struct {
     {"444P9",       IMGFMT_444P9},
     {"422P16",      IMGFMT_422P16},
     {"422P10",      IMGFMT_422P10},
+    {"422P9",       IMGFMT_422P9},
     {"420P16",      IMGFMT_420P16},
     {"420P10",      IMGFMT_420P10},
     {"420P9",       IMGFMT_420P9},

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/fmt-conversion.c	Thu Jan  5 21:32:10 2012	(r34524)
@@ -93,6 +93,8 @@ static const struct {
     {IMGFMT_422P16_BE,  PIX_FMT_YUV422P16BE},
     {IMGFMT_422P10_LE,  PIX_FMT_YUV422P10LE},
     {IMGFMT_422P10_BE,  PIX_FMT_YUV422P10BE},
+    {IMGFMT_422P9_LE,   PIX_FMT_YUV422P9LE},
+    {IMGFMT_422P9_BE,   PIX_FMT_YUV422P9BE},
     {IMGFMT_444P16_LE,  PIX_FMT_YUV444P16LE},
     {IMGFMT_444P16_BE,  PIX_FMT_YUV444P16BE},
     {IMGFMT_444P10_LE,  PIX_FMT_YUV444P10LE},

Modified: trunk/libmpcodecs/img_format.c
==============================================================================
--- trunk/libmpcodecs/img_format.c	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/libmpcodecs/img_format.c	Thu Jan  5 21:32:10 2012	(r34524)
@@ -69,6 +69,8 @@ const char *vo_format_name(int format)
     case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian";
     case IMGFMT_422P10_LE: return "Planar 422P 10-bit little-endian";
     case IMGFMT_422P10_BE: return "Planar 422P 10-bit big-endian";
+    case IMGFMT_422P9_LE:  return "Planar 422P 9-bit little-endian";
+    case IMGFMT_422P9_BE:  return "Planar 422P 9-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";

Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/libmpcodecs/img_format.h	Thu Jan  5 21:32:10 2012	(r34524)
@@ -133,6 +133,8 @@
 #define IMGFMT_422P16_BE 0x34323251
 #define IMGFMT_422P10_LE 0x52323234
 #define IMGFMT_422P10_BE 0x34323252
+#define IMGFMT_422P9_LE  0x53323234
+#define IMGFMT_422P9_BE  0x34323253
 #define IMGFMT_420P16_LE 0x51303234
 #define IMGFMT_420P16_BE 0x34323051
 #define IMGFMT_420P10_LE 0x52303234
@@ -145,6 +147,7 @@
 #define IMGFMT_444P9  IMGFMT_444P9_BE
 #define IMGFMT_422P16 IMGFMT_422P16_BE
 #define IMGFMT_422P10 IMGFMT_422P10_BE
+#define IMGFMT_422P9  IMGFMT_422P9_BE
 #define IMGFMT_420P16 IMGFMT_420P16_BE
 #define IMGFMT_420P10 IMGFMT_420P10_BE
 #define IMGFMT_420P9  IMGFMT_420P9_BE
@@ -155,6 +158,7 @@
 #define IMGFMT_444P9  IMGFMT_444P9_LE
 #define IMGFMT_422P16 IMGFMT_422P16_LE
 #define IMGFMT_422P10 IMGFMT_422P10_LE
+#define IMGFMT_422P9  IMGFMT_422P9_LE
 #define IMGFMT_420P16 IMGFMT_420P16_LE
 #define IMGFMT_420P10 IMGFMT_420P10_LE
 #define IMGFMT_420P9  IMGFMT_420P9_LE

Modified: trunk/libmpcodecs/mp_image.c
==============================================================================
--- trunk/libmpcodecs/mp_image.c	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/libmpcodecs/mp_image.c	Thu Jan  5 21:32:10 2012	(r34524)
@@ -158,6 +158,8 @@ void mp_image_setfmt(mp_image_t* mpi,uns
     case IMGFMT_422P16_BE:
     case IMGFMT_422P10_LE:
     case IMGFMT_422P10_BE:
+    case IMGFMT_422P9_LE:
+    case IMGFMT_422P9_BE:
     case IMGFMT_420P16_LE:
     case IMGFMT_420P16_BE:
     case IMGFMT_420P10_LE:

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/libmpcodecs/vf_scale.c	Thu Jan  5 21:32:10 2012	(r34524)
@@ -77,6 +77,8 @@ static const unsigned int outfmt_list[]=
     IMGFMT_422P16_BE,
     IMGFMT_422P10_LE,
     IMGFMT_422P10_BE,
+    IMGFMT_422P9_LE,
+    IMGFMT_422P9_BE,
     IMGFMT_YV12,
     IMGFMT_I420,
     IMGFMT_420P16_LE,

Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c	Thu Jan  5 21:18:38 2012	(r34523)
+++ trunk/m_option.c	Thu Jan  5 21:32:10 2012	(r34524)
@@ -1084,6 +1084,8 @@ static struct {
   {"422p16be", IMGFMT_422P16_BE},
   {"422p10le", IMGFMT_422P10_LE},
   {"422p10be", IMGFMT_422P10_BE},
+  {"422p9le",  IMGFMT_422P9_LE},
+  {"422p9be",  IMGFMT_422P9_BE},
   {"420p16le", IMGFMT_420P16_LE},
   {"420p16be", IMGFMT_420P16_BE},
   {"420p10le", IMGFMT_420P10_LE},