Changeset 6046

Timestamp:

Jul 29, 2019 2:25:34 AM (5 years ago)

Author:

nanang

Message:

Misc (re #2210): Added format definitions for NV12 & NV21.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/format.h (modified) (1 diff)
• src/pjmedia/ffmpeg_util.c (modified) (1 diff)
• src/pjmedia/format.c (modified) (3 diffs)

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

@@ -177 +177 @@
     PJMEDIA_FORMAT_YV12     = PJMEDIA_FORMAT_PACK('Y', 'V', '1', '2'),
 
+    /**
+     * This is planar 4:2:0/12bpp YUV format, the data can be treated as
+     * two planes of color components, where the first plane contains
+     * only the Y samples, the second plane contains interleaved
+     * U (Cb) - V (Cr) samples.
+     */
+    PJMEDIA_FORMAT_NV12     = PJMEDIA_FORMAT_PACK('N', 'V', '1', '2'),
+    
     /**
      * This is planar 4:2:0/12bpp YUV format, the data can be treated as

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

@@ -48 +48 @@
     { PJMEDIA_FORMAT_I420JPEG, AV(PIX_FMT_YUVJ420P)},
     { PJMEDIA_FORMAT_I422JPEG, AV(PIX_FMT_YUVJ422P)},
+    { PJMEDIA_FORMAT_NV12, AV(PIX_FMT_NV12)},
+    { PJMEDIA_FORMAT_NV21, AV(PIX_FMT_NV21)},
 };
 

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

@@ -64 +64 @@
                                     pjmedia_video_apply_fmt_param *aparam);
 
+static pj_status_t apply_biplanar_420(const pjmedia_video_format_info *fi,
+                                      pjmedia_video_apply_fmt_param *aparam);
+
 struct pjmedia_video_format_mgr
 {
@@ -88 +91 @@
     {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},
+    {PJMEDIA_FORMAT_NV12,  "NV12", PJMEDIA_COLOR_MODEL_YUV, 12, 2, &apply_biplanar_420},
+    {PJMEDIA_FORMAT_NV21,  "NV21", PJMEDIA_COLOR_MODEL_YUV, 12, 2, &apply_biplanar_420},
 };
 
@@ -261 +266 @@
     return PJ_SUCCESS;
 }
+
+static pj_status_t apply_biplanar_420(const pjmedia_video_format_info *fi,
+                                      pjmedia_video_apply_fmt_param *aparam)
+{
+    unsigned i;
+    pj_size_t Y_bytes;
+
+    PJ_UNUSED_ARG(fi);
+
+    /* Calculate memsize */
+    Y_bytes = (pj_size_t)(aparam->size.w * aparam->size.h);
+    aparam->framebytes = Y_bytes + (Y_bytes>>1);
+
+    /* Planar formats use 2 plane */
+    aparam->strides[0] = aparam->size.w;
+    aparam->strides[1] = aparam->size.w;
+
+    aparam->planes[0] = aparam->buffer;
+    aparam->planes[1] = aparam->planes[0] + Y_bytes;
+
+    aparam->plane_bytes[0] = Y_bytes;
+    aparam->plane_bytes[1] = (Y_bytes>>1);
+
+    /* Zero unused planes */
+    for (i=2; i<PJMEDIA_MAX_VIDEO_PLANES; ++i) {
+        aparam->strides[i] = 0;
+        aparam->planes[i] = NULL;
+        aparam->plane_bytes[i] = 0;
+    }
+
+    return PJ_SUCCESS;
+}
+
 
 PJ_DEF(pj_status_t)