Changeset 3819 for pjproject/trunk/pjmedia/src/pjmedia/format.c

Timestamp:

Oct 18, 2011 1:51:01 AM (13 years ago)

Author:

nanang

Message:

Reenable ffmpeg H264 (re #1390):

• Review H264 codec settings such as profile, level, NAL unit size, bitrate, quality, latency.
• Added new format PJMEDIA_FORMAT_GBRP, 24 bits planar RGB, one of the formats outputted by the latest ffmpeg H264 decoder.
• Fixed format change detection bug in ffmpeg wrapper, decoder didn't update its internal state with the new format so format change event was generated in every decoding operation.
• Added compile time configurations for enabling/disabling ffmpeg codec H263+ & H264.
• Updated pjsua app to adjust window size to original video size. With H264, default window size will be too big as it is init'd with default H264 video size, e.g: 720x480 for profile level 30.

File:

• pjproject/trunk/pjmedia/src/pjmedia/format.c (modified) (3 diffs)

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

@@ -79 +79 @@
                                     pjmedia_video_apply_fmt_param *aparam);
 
+static pj_status_t apply_planar_444(const pjmedia_video_format_info *fi,
+                                    pjmedia_video_apply_fmt_param *aparam);
+
 struct pjmedia_video_format_mgr
 {
@@ -93 +96 @@
     {PJMEDIA_FORMAT_BGRA,  "BGRA", PJMEDIA_COLOR_MODEL_RGB, 32, 1, &apply_packed_fmt},
     {PJMEDIA_FORMAT_DIB ,  "DIB ", PJMEDIA_COLOR_MODEL_RGB, 24, 1, &apply_packed_fmt},
+    {PJMEDIA_FORMAT_GBRP,  "GBRP", PJMEDIA_COLOR_MODEL_RGB, 24, 3, &apply_planar_444},
     {PJMEDIA_FORMAT_AYUV,  "AYUV", PJMEDIA_COLOR_MODEL_YUV, 32, 1, &apply_packed_fmt},
     {PJMEDIA_FORMAT_YUY2,  "YUY2", PJMEDIA_COLOR_MODEL_YUV, 16, 1, &apply_packed_fmt},
@@ -241 +245 @@
 }
 
+static pj_status_t apply_planar_444(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 * 3);
+
+    /* Planar formats use 3 plane */
+    aparam->strides[0] = aparam->strides[1] = 
+                         aparam->strides[2] = aparam->size.w;
+
+    aparam->planes[0] = aparam->buffer;
+    aparam->planes[1] = aparam->planes[0] + Y_bytes;
+    aparam->planes[2] = aparam->planes[1] + Y_bytes;
+
+    aparam->plane_bytes[0] = aparam->plane_bytes[1] =
+                             aparam->plane_bytes[2] = Y_bytes;
+
+    /* Zero unused planes */
+    for (i=3; 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)
 pjmedia_video_format_mgr_create(pj_pool_t *pool,