Changeset 4158 for pjproject

Timestamp:

Jun 6, 2012 9:56:14 AM (12 years ago)

Author:

nanang

Message:

Fix #1528:

• fixed video format YV12 (was YUV planar 16bpp, should be YVU planar 12bpp)
• added I422 (YUV planar 16bpp, was defined as YV12)
• updated colorbar video device to support YV12.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/format.h (modified) (1 diff)
• src/pjmedia-videodev/colorbar_dev.c (modified) (2 diffs)
• src/pjmedia/ffmpeg_util.c (modified) (1 diff)
• src/pjmedia/format.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/format.h

@@ -170 +170 @@
 
     /**
-     * This is planar 4:2:2/16bpp YUV format.
+     * This is planar 4:2:0/12bpp YUV format, similar to I420 or IYUV but
+     * the U (Cb) and V (Cr) planes order is switched, i.e: the second plane
+     * contains the V (Cb) samples and the third plane contains the V (Cr)
+     * samples.
      */
     PJMEDIA_FORMAT_YV12     = PJMEDIA_FORMAT_PACK('Y', 'V', '1', '2'),
+
+    /**
+     * This is planar 4:2:2/16bpp YUV format, the data can be treated as
+     * three planes of color components, where the first plane contains
+     * only the Y samples, the second plane contains only the U (Cb) samples,
+     * and the third plane contains only the V (Cr) sample.
+     */
+    PJMEDIA_FORMAT_I422     = PJMEDIA_FORMAT_PACK('I', '4', '2', '2'),
 
     /**

pjproject/trunk/pjmedia/src/pjmedia-videodev/colorbar_dev.c

@@ -77 +77 @@
     { PJMEDIA_FORMAT_YV12 },
     { PJMEDIA_FORMAT_I420 },
+    { PJMEDIA_FORMAT_I422 },
     { PJMEDIA_FORMAT_I420JPEG },
     { PJMEDIA_FORMAT_I422JPEG },
@@ -355 +356 @@
                 if (vfi->color_model == PJMEDIA_COLOR_MODEL_RGB)
                     c = rgb_colors[i][j];
-                else
-                    c = yuv_colors[i][j];
+                else {
+                    if (vfi->id == PJMEDIA_FORMAT_YV12 && j > 0)
+                        c = yuv_colors[i][3-j];
+                    else
+                        c = yuv_colors[i][j];
+                }
 
                 bar_width = vafp->strides[j]/8;

pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.c

@@ -53 +53 @@
     { PJMEDIA_FORMAT_UYVY, PIX_FMT_UYVY422},
     { PJMEDIA_FORMAT_I420, PIX_FMT_YUV420P},
-    { PJMEDIA_FORMAT_YV12, PIX_FMT_YUV422P},
+    //{ PJMEDIA_FORMAT_YV12, PIX_FMT_YUV420P},
+    { PJMEDIA_FORMAT_I422, PIX_FMT_YUV422P},
     { PJMEDIA_FORMAT_I420JPEG, PIX_FMT_YUVJ420P},
     { PJMEDIA_FORMAT_I422JPEG, PIX_FMT_YUVJ422P},

pjproject/trunk/pjmedia/src/pjmedia/format.c

@@ -106 +106 @@
     {PJMEDIA_FORMAT_YVYU,  "YVYU", PJMEDIA_COLOR_MODEL_YUV, 16, 1, &apply_packed_fmt},
     {PJMEDIA_FORMAT_I420,  "I420", PJMEDIA_COLOR_MODEL_YUV, 12, 3, &apply_planar_420},
-    {PJMEDIA_FORMAT_YV12,  "YV12", PJMEDIA_COLOR_MODEL_YUV, 16, 3, &apply_planar_422},
+    {PJMEDIA_FORMAT_YV12,  "YV12", PJMEDIA_COLOR_MODEL_YUV, 12, 3, &apply_planar_420},
+    {PJMEDIA_FORMAT_I422,  "I422", PJMEDIA_COLOR_MODEL_YUV, 16, 3, &apply_planar_422},
     {PJMEDIA_FORMAT_I420JPEG, "I420JPG", PJMEDIA_COLOR_MODEL_YUV, 12, 3, &apply_planar_420},
     {PJMEDIA_FORMAT_I422JPEG, "I422JPG", PJMEDIA_COLOR_MODEL_YUV, 16, 3, &apply_planar_422},