Changeset 5939 for pjproject

Timestamp:

Mar 5, 2019 6:23:02 AM (5 years ago)

Author:

nanang

Message:

Re #2181: Initial version of video conference implementation.

Location:

pjproject/trunk

Files:

• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/build/pjmedia.vcproj (modified) (2 diffs)
• pjmedia/include/pjmedia.h (modified) (1 diff)
• pjmedia/include/pjmedia/converter.h (modified) (5 diffs)
• pjmedia/include/pjmedia/signatures.h (modified) (1 diff)
• pjmedia/include/pjmedia/vid_conf.h (added)
• pjmedia/include/pjmedia/vid_port.h (modified) (1 diff)
• pjmedia/src/pjmedia/converter.c (modified) (1 diff)
• pjmedia/src/pjmedia/converter_libswscale.c (modified) (3 diffs)
• pjmedia/src/pjmedia/converter_libyuv.c (modified) (5 diffs)
• pjmedia/src/pjmedia/vid_conf.c (added)
• pjmedia/src/pjmedia/vid_port.c (modified) (4 diffs)
• pjmedia/src/pjmedia/vid_stream.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app_cli.c (modified) (5 diffs)
• pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (7 diffs)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (26 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -74 +74 @@
                         transport_ice.o transport_loop.o transport_srtp.o transport_udp.o \
                         types.o vid_codec.o vid_codec_util.o \
-                        vid_port.o vid_stream.o vid_stream_info.o vid_tee.o \
+                        vid_port.o vid_stream.o vid_stream_info.o vid_conf.o \
                         wav_player.o wav_playlist.o wav_writer.o wave.o \
                         wsola.o audiodev.o videodev.o

pjproject/trunk/pjmedia/build/pjmedia.vcproj

@@ -7008 +7008 @@
                         </File>
                         <File
+                                RelativePath="..\src\pjmedia\vid_conf.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\pjmedia\vid_port.c"
                                 >
@@ -7697 +7701 @@
                         </File>
                         <File
+                                RelativePath="..\include\pjmedia\vid_conf.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\pjmedia\vid_port.h"
                                 >

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -69 +69 @@
 #include <pjmedia/transport_srtp.h>
 #include <pjmedia/transport_udp.h>
+#include <pjmedia/vid_codec.h>
+#include <pjmedia/vid_conf.h>
 #include <pjmedia/vid_port.h>
-#include <pjmedia/vid_codec.h>
 #include <pjmedia/vid_stream.h>
-#include <pjmedia/vid_tee.h>
+//#include <pjmedia/vid_tee.h>
 #include <pjmedia/wav_playlist.h>
 #include <pjmedia/wav_port.h>

pjproject/trunk/pjmedia/include/pjmedia/converter.h

@@ -124 +124 @@
 
 /**
+ * Settings for pjmedia_converter_convert2().
+ */
+typedef void pjmedia_converter_convert_setting;
+
+
+/**
  * Converter factory operation.
  */
@@ -158 +164 @@
 {
     /**
-     * Convert the buffer in the source frame and save the result in the
+     * Convert the buffer of the source frame and save the result in the
      * buffer of the destination frame, according to conversion format that
      * was specified when the converter was created.
@@ -165 +171 @@
      * of calling this function directly.
      *
-     * @param cv        The converter instance.
-     * @param src_frame The source frame.
-     * @param dst_frame The destination frame.
-     *
-     * @return          PJ_SUCCESS if conversion has been performed
-     *                  successfully.
+     * @param cv                The converter instance.
+     * @param src_frame         The source frame.
+     * @param dst_frame         The destination frame.
+     *
+     * @return                  PJ_SUCCESS if conversion has been performed
+     *                          successfully.
      */
     pj_status_t (*convert)(pjmedia_converter *cv,
@@ -182 +188 @@
      * of calling this function directly.
      *
-     * @param cv        The converter.
+     * @param cv                The converter.
      */
     void (*destroy)(pjmedia_converter *cv);
+
+    /**
+     * Convert a region in the buffer of the source frame and put the result
+     * into a region in the buffer of the destination frame, according to
+     * conversion format that was specified when the converter was created.
+     *
+     * Note that application should use #pjmedia_converter_convert2() instead
+     * of calling this function directly.
+     *
+     * @param cv                The converter instance.
+     * @param src_frame         The source frame.
+     * @param src_frame_size    The source frame size.
+     * @param src_reg_pos       The source region position.
+     * @param dst_frame         The destination frame.
+     * @param dst_frame_size    The destination frame size.
+     * @param dst_reg_pos       The destination region position.
+     * @param param             This is unused for now and must be NULL.
+     *
+     * @return                  PJ_SUCCESS if conversion has been performed
+     *                          successfully.
+     */
+    pj_status_t (*convert2)(pjmedia_converter       *cv,
+                            pjmedia_frame           *src_frame,
+                            const pjmedia_rect_size *src_frame_size,
+                            const pjmedia_coord     *src_pos,
+                            pjmedia_frame           *dst_frame,
+                            const pjmedia_rect_size *dst_frame_size,
+                            const pjmedia_coord     *dst_pos,
+                            pjmedia_converter_convert_setting
+                                                    *param);
 
 };
@@ -303 +339 @@
                                                pjmedia_frame *dst_frame);
 
+
+/**
+ * Convert a region in the buffer of the source frame and put the result
+ * into a region in the buffer of the destination frame, according to
+ * conversion format that was specified when the converter was created.
+ *
+ * @param cv                The converter instance.
+ * @param src_frame         The source frame.
+ * @param src_frame_size    The source frame size.
+ * @param src_reg_pos       The source region position.
+ * @param dst_frame         The destination frame.
+ * @param dst_frame_size    The destination frame size.
+ * @param dst_reg_pos       The destination region position.
+ * @param param             This is unused for now and must be NULL.
+ *
+ * @return                  PJ_SUCCESS if conversion has been performed
+ *                          successfully.
+ */
+PJ_DECL(pj_status_t) pjmedia_converter_convert2(
+                                    pjmedia_converter       *cv,
+                                    pjmedia_frame           *src_frame,
+                                    const pjmedia_rect_size *src_frame_size,
+                                    const pjmedia_coord     *src_pos,
+                                    pjmedia_frame           *dst_frame,
+                                    const pjmedia_rect_size *dst_frame_size,
+                                    const pjmedia_coord     *dst_pos,
+                                    pjmedia_converter_convert_setting
+                                                            *param);
+
 /**
  * Destroy the converter.

pjproject/trunk/pjmedia/include/pjmedia/signatures.h

@@ -198 +198 @@
 #define PJMEDIA_SIG_IS_CLASS_VID_OTHER(s) ((s)>>24=='V' && (s)>>16=='O')
 
+#define PJMEDIA_SIG_VID_CONF            PJMEDIA_SIG_CLASS_VID_OTHER('C','F')
 #define PJMEDIA_SIG_VID_PORT            PJMEDIA_SIG_CLASS_VID_OTHER('P','O')
 

pjproject/trunk/pjmedia/include/pjmedia/vid_port.h

@@ -154 +154 @@
 
 /**
+ * Subscribe media event notifications from the specified media port.
+ * Sample use case is that renderer video port needs to monitor stream port
+ * events so renderer can adjust its param whenever stream port detects
+ * format change.
+ *
+ * @param vid_port      The video port.
+ * @param port          The media port whose events to be monitored.
+ *
+ * @return              PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_vid_port_subscribe_event(
+                                                pjmedia_vid_port *vid_port,
+                                                pjmedia_port *port);
+
+/**
  * Connect the video port to a downstream (slave) media port. This operation
  * is only valid for video ports created with active interface selected.

pjproject/trunk/pjmedia/src/pjmedia/converter.c

@@ -192 +192 @@
 }
 
-
+PJ_DEF(pj_status_t) pjmedia_converter_convert2(
+                                    pjmedia_converter       *cv,
+                                    pjmedia_frame           *src_frame,
+                                    const pjmedia_rect_size *src_frame_size,
+                                    const pjmedia_coord     *src_pos,
+                                    pjmedia_frame           *dst_frame,
+                                    const pjmedia_rect_size *dst_frame_size,
+                                    const pjmedia_coord     *dst_pos,
+                                    void                    *param)
+{
+    if (!cv->op->convert2)
+        return PJ_ENOTSUP;
+
+    return (*cv->op->convert2)(cv, src_frame, src_frame_size, src_pos,
+                               dst_frame, dst_frame_size, dst_pos, param);
+}
+

pjproject/trunk/pjmedia/src/pjmedia/converter_libswscale.c

@@ -34 +34 @@
                                            pjmedia_frame *src_frame,
                                            pjmedia_frame *dst_frame);
+static pj_status_t libswscale_conv_convert2(
+                                    pjmedia_converter       *converter,
+                                    pjmedia_frame           *src_frame,
+                                    const pjmedia_rect_size *src_frame_size,
+                                    const pjmedia_coord     *src_pos,
+                                    pjmedia_frame           *dst_frame,
+                                    const pjmedia_rect_size *dst_frame_size,
+                                    const pjmedia_coord     *dst_pos,
+                                    pjmedia_converter_convert_setting
+                                                            *param);
 static void libswscale_conv_destroy(pjmedia_converter *converter);
 
@@ -60 +70 @@
 {
     &libswscale_conv_convert,
-    &libswscale_conv_destroy
+    &libswscale_conv_destroy,
+    &libswscale_conv_convert2
 };
 
@@ -165 +176 @@
 }
 
+static pj_status_t libswscale_conv_convert2(
+                                    pjmedia_converter       *converter,
+                                    pjmedia_frame           *src_frame,
+                                    const pjmedia_rect_size *src_frame_size,
+                                    const pjmedia_coord     *src_pos,
+                                    pjmedia_frame           *dst_frame,
+                                    const pjmedia_rect_size *dst_frame_size,
+                                    const pjmedia_coord     *dst_pos,
+                                    pjmedia_converter_convert_setting
+                                                            *param)
+{
+    struct ffmpeg_converter *fcv = (struct ffmpeg_converter*)converter;
+    struct fmt_info *src = &fcv->src,
+                    *dst = &fcv->dst;
+    int h;
+    unsigned j;
+    pjmedia_rect_size orig_src_size;
+    pjmedia_rect_size orig_dst_size;
+
+    PJ_UNUSED_ARG(param);
+
+    /* Save original conversion sizes */
+    orig_src_size = src->apply_param.size;
+    orig_dst_size = dst->apply_param.size;
+
+    /* Set the first act buffer from src frame, and overwrite size. */
+    src->apply_param.buffer = src_frame->buf;
+    src->apply_param.size   = *src_frame_size;
+    (*src->fmt_info->apply_fmt)(src->fmt_info, &src->apply_param);
+
+    /* Set the last act buffer from dst frame, and overwrite size. */
+    dst->apply_param.buffer = dst_frame->buf;
+    dst->apply_param.size   = *dst_frame_size;
+    (*dst->fmt_info->apply_fmt)(dst->fmt_info, &dst->apply_param);
+
+    for (j = 0; j < src->fmt_info->plane_cnt; ++j) {
+        pjmedia_video_apply_fmt_param *ap = &src->apply_param;
+        int y = src_pos->y * ap->plane_bytes[j] / ap->strides[j] /
+                ap->size.h;
+        ap->planes[j] += y * ap->strides[j] +
+                         src_pos->x * ap->strides[j] / ap->size.w;
+    }
+
+    for (j = 0; j < dst->fmt_info->plane_cnt; ++j) {
+        pjmedia_video_apply_fmt_param *ap = &dst->apply_param;
+        int y = dst_pos->y * ap->plane_bytes[j] / ap->strides[j] /
+                ap->size.h;
+        ap->planes[j] += y * ap->strides[j] +
+                         dst_pos->x * ap->strides[j] / ap->size.w;
+    }
+
+    /* Return back the original conversion size */
+    src->apply_param.size = orig_src_size;
+    dst->apply_param.size = orig_dst_size;
+
+    h = sws_scale(fcv->sws_ctx,
+                  (const uint8_t* const *)src->apply_param.planes,
+                  src->apply_param.strides,
+                  0, src->apply_param.size.h,
+                  dst->apply_param.planes, dst->apply_param.strides);
+
+    //sws_scale() return value can't be trusted? There are cases when
+    //sws_scale() returns zero but conversion seems to work okay.
+    //return h==(int)dst->apply_param.size.h ? PJ_SUCCESS : PJ_EUNKNOWN;
+    PJ_UNUSED_ARG(h);
+
+    return PJ_SUCCESS;
+}
+
 static void libswscale_conv_destroy(pjmedia_converter *converter)
 {

pjproject/trunk/pjmedia/src/pjmedia/converter_libyuv.c

@@ -37 +37 @@
                                        pjmedia_frame *dst_frame);
 
+static pj_status_t libyuv_conv_convert2(
+                                    pjmedia_converter       *converter,
+                                    pjmedia_frame           *src_frame,
+                                    const pjmedia_rect_size *src_frame_size,
+                                    const pjmedia_coord     *src_pos,
+                                    pjmedia_frame           *dst_frame,
+                                    const pjmedia_rect_size *dst_frame_size,
+                                    const pjmedia_coord     *dst_pos,
+                                    void                    *param);
+
 static void libyuv_conv_destroy(pjmedia_converter *converter);
 
@@ -48 +58 @@
 {
     &libyuv_conv_convert,
-    &libyuv_conv_destroy
+    &libyuv_conv_destroy,
+    &libyuv_conv_convert2
 };
 
@@ -347 +358 @@
 
     /* Convert to I420 or BGRA if needed. */
-    if ((src_id != PJMEDIA_FORMAT_I420) || (src_id != PJMEDIA_FORMAT_BGRA)) {
+    if ((src_id != PJMEDIA_FORMAT_I420) && (src_id != PJMEDIA_FORMAT_BGRA)) {
         pj_uint32_t next_id = get_next_conv_fmt(src_id);
         if (get_converter_map(src_id, next_id, src_size, dst_size, ++act_num, 
@@ -359 +370 @@
 
     /* Scale if needed */
-    need_scale = ((src_size->w != dst_size->w) ||
-                  (src_size->h != dst_size->h));
+    //need_scale = ((src_size->w != dst_size->w) ||
+                  //(src_size->h != dst_size->h));
+
+    // Always enable scale, as this can be used for rendering a region of
+    // a frame to another region of similar/another frame.
+    need_scale = PJ_TRUE;
 
     if (need_scale) {
@@ -623 +638 @@
 }
 
+static pj_status_t libyuv_conv_convert2(
+                                    pjmedia_converter       *converter,
+                                    pjmedia_frame           *src_frame,
+                                    const pjmedia_rect_size *src_frame_size,
+                                    const pjmedia_coord     *src_pos,
+                                    pjmedia_frame           *dst_frame,
+                                    const pjmedia_rect_size *dst_frame_size,
+                                    const pjmedia_coord     *dst_pos,
+                                    pjmedia_converter_convert_setting
+                                                            *param)
+{
+    struct libyuv_converter *lconv = (struct libyuv_converter*)converter;
+    int i = 0;
+    fmt_info *src_info = &lconv->act[0].src_fmt_info;
+    fmt_info *dst_info = &lconv->act[lconv->act_num-1].dst_fmt_info;
+    pjmedia_rect_size orig_src_size;
+    pjmedia_rect_size orig_dst_size;
+
+    PJ_UNUSED_ARG(param);
+
+    /* Save original conversion sizes */
+    orig_src_size = src_info->apply_param.size;
+    orig_dst_size = dst_info->apply_param.size;
+
+    /* Set the first act buffer from src frame, and overwrite size. */
+    src_info->apply_param.buffer = src_frame->buf;
+    src_info->apply_param.size   = *src_frame_size;
+
+    /* Set the last act buffer from dst frame, and overwrite size. */
+    dst_info->apply_param.buffer = dst_frame->buf;
+    dst_info->apply_param.size   = *dst_frame_size;
+
+    for (i=0;i<lconv->act_num;++i) {
+        /* Use destination info as the source info for the next act. */
+        struct fmt_info *src_fmt_info = (i==0)? src_info : 
+                                        &lconv->act[i-1].dst_fmt_info;
+
+        struct fmt_info *dst_fmt_info = &lconv->act[i].dst_fmt_info;    
+        
+        (*src_fmt_info->vid_fmt_info->apply_fmt)(src_fmt_info->vid_fmt_info, 
+                                                 &src_fmt_info->apply_param);
+
+        (*dst_fmt_info->vid_fmt_info->apply_fmt)(dst_fmt_info->vid_fmt_info, 
+                                                 &dst_fmt_info->apply_param);
+
+        /* For first and last acts, apply plane buffer offset and return back
+         * the original sizes.
+         */
+        if (i == 0) {
+            pjmedia_video_apply_fmt_param *ap = &src_fmt_info->apply_param;
+            unsigned j;
+            for (j = 0; j < src_fmt_info->vid_fmt_info->plane_cnt; ++j) {
+                int y = src_pos->y * ap->plane_bytes[j] / ap->strides[j] /
+                        ap->size.h;
+                ap->planes[j] += y * ap->strides[j] + src_pos->x *
+                                 ap->strides[j] / ap->size.w;
+            }
+            ap->size = orig_src_size;
+        }
+        if (i == lconv->act_num-1) {
+            pjmedia_video_apply_fmt_param *ap = &dst_fmt_info->apply_param;
+            unsigned j;
+            for (j = 0; j < dst_fmt_info->vid_fmt_info->plane_cnt; ++j)
+            {
+                int y = dst_pos->y * ap->plane_bytes[j] / ap->strides[j] /
+                        ap->size.h;
+                ap->planes[j] += y * ap->strides[j] + dst_pos->x *
+                                 ap->strides[j] / ap->size.w;
+            }
+            ap->size = orig_dst_size;
+        }
+
+        switch (lconv->act[i].act_type) {
+        case CONV_PACK_TO_PACK:
+            (*lconv->act[i].method.conv_pack_to_pack)(
+                              (const uint8*)src_fmt_info->apply_param.planes[0],
+                              src_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.planes[0], 
+                              dst_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.size.w, 
+                              dst_fmt_info->apply_param.size.h);
+            break;
+        case CONV_PACK_TO_PLANAR:
+            (*lconv->act[i].method.conv_pack_to_planar)(
+                              (const uint8*)src_fmt_info->apply_param.planes[0],
+                              src_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.planes[0], 
+                              dst_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.planes[1], 
+                              dst_fmt_info->apply_param.strides[1],
+                              dst_fmt_info->apply_param.planes[2], 
+                              dst_fmt_info->apply_param.strides[2],
+                              dst_fmt_info->apply_param.size.w, 
+                              dst_fmt_info->apply_param.size.h);
+            break;
+        case CONV_PLANAR_TO_PACK:
+            (*lconv->act[i].method.conv_planar_to_pack)(
+                              (const uint8*)src_fmt_info->apply_param.planes[0],
+                              src_fmt_info->apply_param.strides[0],
+                              (const uint8*)src_fmt_info->apply_param.planes[1],
+                              src_fmt_info->apply_param.strides[1],
+                              (const uint8*)src_fmt_info->apply_param.planes[2],
+                              src_fmt_info->apply_param.strides[2],
+                              dst_fmt_info->apply_param.planes[0], 
+                              dst_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.size.w, 
+                              dst_fmt_info->apply_param.size.h);
+            break;
+        case CONV_PLANAR_TO_PLANAR:
+            (*lconv->act[i].method.conv_planar_to_planar)(
+                              (const uint8*)src_fmt_info->apply_param.planes[0],
+                              src_fmt_info->apply_param.strides[0],
+                              (const uint8*)src_fmt_info->apply_param.planes[1],
+                              src_fmt_info->apply_param.strides[1],
+                              (const uint8*)src_fmt_info->apply_param.planes[2],
+                              src_fmt_info->apply_param.strides[2],
+                              dst_fmt_info->apply_param.planes[0], 
+                              dst_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.planes[1], 
+                              dst_fmt_info->apply_param.strides[1],
+                              dst_fmt_info->apply_param.planes[2], 
+                              dst_fmt_info->apply_param.strides[2],
+                              dst_fmt_info->apply_param.size.w, 
+                              dst_fmt_info->apply_param.size.h);
+            break;
+        case SCALE_PACK:
+            (*lconv->act[i].method.scale_pack)(
+                              (const uint8*)src_fmt_info->apply_param.planes[0],
+                              src_fmt_info->apply_param.strides[0],
+                              src_fmt_info->apply_param.size.w,
+                              src_fmt_info->apply_param.size.h,
+                              (uint8*)dst_fmt_info->apply_param.planes[0],
+                              dst_fmt_info->apply_param.strides[0],
+                              dst_fmt_info->apply_param.size.w,
+                              dst_fmt_info->apply_param.size.h,
+                              LIBYUV_FILTER_MODE);
+            break;      
+        case SCALE_PLANAR:
+            (*lconv->act[i].method.scale_planar)(
+                              (const uint8*)src_fmt_info->apply_param.planes[0],
+                              src_fmt_info->apply_param.strides[0],
+                              (const uint8*)src_fmt_info->apply_param.planes[1],
+                              src_fmt_info->apply_param.strides[1],
+                              (const uint8*)src_fmt_info->apply_param.planes[2],
+                              src_fmt_info->apply_param.strides[2],
+                              src_fmt_info->apply_param.size.w,
+                              src_fmt_info->apply_param.size.h,
+                              (uint8*)dst_fmt_info->apply_param.planes[0],
+                              dst_fmt_info->apply_param.strides[0],
+                              (uint8*)dst_fmt_info->apply_param.planes[1],
+                              dst_fmt_info->apply_param.strides[1],
+                              (uint8*)dst_fmt_info->apply_param.planes[2],
+                              dst_fmt_info->apply_param.strides[2],
+                              dst_fmt_info->apply_param.size.w,
+                              dst_fmt_info->apply_param.size.h,
+                              LIBYUV_FILTER_MODE);
+            break;      
+        };      
+    }    
+    return PJ_SUCCESS;
+}
+
 static void libyuv_conv_destroy(pjmedia_converter *converter)
 {

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -647 +647 @@
         vp->pasv_port = pp = PJ_POOL_ZALLOC_T(pool, vid_pasv_port);
         pp->vp = vp;
-        pp->base.get_frame = &vid_pasv_port_get_frame;
-        pp->base.put_frame = &vid_pasv_port_put_frame;
+        if (prm->vidparam.dir & PJMEDIA_DIR_CAPTURE)
+            pp->base.get_frame = &vid_pasv_port_get_frame;
+        if (prm->vidparam.dir & PJMEDIA_DIR_RENDER)
+            pp->base.put_frame = &vid_pasv_port_put_frame;
         pjmedia_port_info_init2(&pp->base.info, &vp->dev_name,
                                 PJMEDIA_SIG_VID_PORT,
@@ -730 +732 @@
 }
 
+
+PJ_DEF(pj_status_t) pjmedia_vid_port_subscribe_event(
+                                                pjmedia_vid_port *vp,
+                                                pjmedia_port *port)
+{
+    PJ_ASSERT_RETURN(vp && port, PJ_EINVAL);
+
+    /* Subscribe to port's events */
+    return pjmedia_event_subscribe(NULL, &client_port_event_cb, vp, port);
+}
 
 PJ_DEF(pj_status_t) pjmedia_vid_port_connect(pjmedia_vid_port *vp,
@@ -1001 +1013 @@
         }
         
-        if (vp->stream_role == ROLE_PASSIVE) {
+        if (vp->role == ROLE_ACTIVE && vp->stream_role == ROLE_PASSIVE) {
             pjmedia_clock_param clock_param;
             
@@ -1017 +1029 @@
         /* pjmedia_vid_port_start(vp); */
         pjmedia_vid_dev_stream_start(vp->strm);
+
+        /* Update passive port info from the video stream */
+        if (vp->role == ROLE_PASSIVE) {
+            pjmedia_format_copy(&vp->pasv_port->base.info.fmt,
+                                &event->data.fmt_changed.new_fmt);
+        }
     }
     

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -929 +929 @@
     rtp_ts_len = stream->frame_ts_len;
 
+    /* Empty video frame? Just update RTP timestamp for now */
+    if (frame->type==PJMEDIA_FRAME_TYPE_VIDEO && frame->size==0) {
+        pjmedia_rtp_encode_rtp(&channel->rtp, channel->pt, 1, 0,
+                               rtp_ts_len,  (const void**)&rtphdr,
+                               &rtphdrlen);
+        return PJ_SUCCESS;
+    }
+
     /* Init frame_out buffer. */
     pj_bzero(&frame_out, sizeof(frame_out));

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

@@ -103 +103 @@
 #define CMD_VIDEO_CODEC             ((CMD_VIDEO*10)+6)
 #define CMD_VIDEO_WIN               ((CMD_VIDEO*10)+7)
+#define CMD_VIDEO_CONF              ((CMD_VIDEO*10)+8)
 
 /* video level 3 command */
@@ -130 +131 @@
 #define CMD_VIDEO_WIN_MOVE          ((CMD_VIDEO_WIN*10)+5)
 #define CMD_VIDEO_WIN_RESIZE        ((CMD_VIDEO_WIN*10)+6)
+#define CMD_VIDEO_CONF_LIST         ((CMD_VIDEO_CONF*10)+1)
+#define CMD_VIDEO_CONF_CONNECT      ((CMD_VIDEO_CONF*10)+2)
+#define CMD_VIDEO_CONF_DISCONNECT   ((CMD_VIDEO_CONF*10)+3)
 
 /* dynamic choice argument list */
@@ -2466 +2470 @@
 }
 
+static pj_status_t cmd_vid_conf_list()
+{
+    pjsua_conf_port_id id[100];
+    unsigned count = PJ_ARRAY_SIZE(id);
+    unsigned i;
+    pj_status_t status;
+
+    status = pjsua_vid_conf_enum_ports(id, &count);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(1,(THIS_FILE, status,
+                     "Failed enumerating video conf bridge ports"));
+        return status;
+    }
+
+    PJ_LOG(3,(THIS_FILE," Video conference has %d ports:\n", count));
+    PJ_LOG(3,(THIS_FILE," id name                   format               rx           tx    \n"));
+    PJ_LOG(3,(THIS_FILE," ------------------------------------------------------------------\n"));
+    for (i=0; i<count; ++i) {
+        char li_list[PJSUA_MAX_CALLS*4];
+        char tr_list[PJSUA_MAX_CALLS*4];
+        char s[32];
+        unsigned j;
+        pjsua_vid_conf_port_info info;
+        pjmedia_rect_size *size;
+        pjmedia_ratio *fps;
+
+        pjsua_vid_conf_get_port_info(id[i], &info);
+        size = &info.format.det.vid.size;
+        fps = &info.format.det.vid.fps;
+
+        li_list[0] = '\0';
+        for (j=0; j<info.listener_cnt; ++j) {
+            char s[10];
+            pj_ansi_snprintf(s, sizeof(s), "%d%s",
+                             info.listeners[j],
+                             (j==info.listener_cnt-1)?"":",");
+            pj_ansi_strcat(li_list, s);
+        }
+        tr_list[0] = '\0';
+        for (j=0; j<info.transmitter_cnt; ++j) {
+            char s[10];
+            pj_ansi_snprintf(s, sizeof(s), "%d%s", info.transmitters[j],
+                             (j==info.transmitter_cnt-1)?"":",");
+            pj_ansi_strcat(tr_list, s);
+        }
+        pjmedia_fourcc_name(info.format.id, s);
+        s[4] = ' ';
+        pj_ansi_snprintf(s+5, sizeof(s)-5, "%dx%d@%.1f",
+                         size->w, size->h, (float)(fps->num*1.0/fps->denum));
+        PJ_LOG(3,(THIS_FILE,"%3d %.*s%.*s %s%.*s %s%.*s %s\n",
+                            id[i],
+                            (int)info.name.slen, info.name.ptr,
+                            22-(int)info.name.slen, "                   ",
+                            s,
+                            20-pj_ansi_strlen(s), "                    ",
+                            tr_list,
+                            12-pj_ansi_strlen(tr_list), "            ",
+                            li_list));
+    }
+    return PJ_SUCCESS;
+}
+
+static pj_status_t cmd_vid_conf_connect(pj_cli_cmd_val *cval, pj_bool_t connect)
+{
+    int P, Q;
+
+    P = (int)pj_strtol(&cval->argv[1]);
+    Q = (int)pj_strtol(&cval->argv[2]);
+    if (connect)
+        return pjsua_vid_conf_connect(P, Q, NULL);
+    else
+        return pjsua_vid_conf_disconnect(P, Q);
+}
+
+
 /* Video handler */
 static pj_status_t cmd_video_handler(pj_cli_cmd_val *cval)
@@ -2545 +2624 @@
     case CMD_VIDEO_WIN_RESIZE:
         status = cmd_resize_vid_win(cval);
+        break;
+    case CMD_VIDEO_CONF_LIST:
+        status = cmd_vid_conf_list();
+        break;
+    case CMD_VIDEO_CONF_CONNECT:
+    case CMD_VIDEO_CONF_DISCONNECT:
+        status = cmd_vid_conf_connect(cval, (cmd_id==CMD_VIDEO_CONF_CONNECT));
         break;
     }
@@ -3051 +3137 @@
         "    </CMD>"
         "  </CMD>"
+        "  <CMD name='conf' id='6008' desc='Video conference commands'>"
+        "    <CMD name='list' id='60081' desc='List all ports in video conference'/>"
+        "    <CMD name='cc' id='60082' desc='Connect ports in video conference'>"
+        "      <ARG name='source' type='int' desc='Source port ID'/>"
+        "      <ARG name='sink' type='int' desc='Sink port ID'/>"
+        "    </CMD>"
+        "    <CMD name='cd' id='60083' desc='Disconnect ports in video conference'>"
+        "      <ARG name='source' type='int' desc='Source port ID'/>"
+        "      <ARG name='sink' type='int' desc='Sink port ID'/>"
+        "    </CMD>"
+        "  </CMD>"
         "</CMD>";
 

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -297 +297 @@
     puts("| vid win move ID X Y       Move window ID to position X,Y                    |");
     puts("| vid win resize ID w h     Resize window ID to the specified width, height   |");
+    puts("| vid conf list             List all video ports in video conference bridge   |");
+    puts("| vid conf cc P Q           Connect port P to Q in the video conf bridge      |");
+    puts("| vid conf cd P Q           Disconnect port P to Q in the video conf bridge   |");
     puts("+=============================================================================+");
     printf("| Video will be %s in the next offer/answer %s                            |\n",
@@ -592 +595 @@
         } else
             goto on_error;
+    } else if (strcmp(argv[1], "conf")==0) {
+        pj_status_t status;
+
+        if (argc==3 && strcmp(argv[2], "list")==0) {
+            pjsua_conf_port_id id[100];
+            unsigned count = PJ_ARRAY_SIZE(id);
+
+            status = pjsua_vid_conf_enum_ports(id, &count);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(1,(THIS_FILE, status,
+                             "Failed enumerating video conf bridge ports"));
+            } else {
+                unsigned i;
+                printf(" Video conference has %d ports:\n", count);
+                printf(" id name                   format               rx           tx    \n");
+                printf(" ------------------------------------------------------------------\n");
+                for (i=0; i<count; ++i) {
+                    char li_list[PJSUA_MAX_CALLS*4];
+                    char tr_list[PJSUA_MAX_CALLS*4];
+                    char s[32];
+                    unsigned j;
+                    pjsua_vid_conf_port_info info;
+                    pjmedia_rect_size *size;
+                    pjmedia_ratio *fps;
+
+                    pjsua_vid_conf_get_port_info(id[i], &info);
+                    size = &info.format.det.vid.size;
+                    fps = &info.format.det.vid.fps;
+
+                    li_list[0] = '\0';
+                    for (j=0; j<info.listener_cnt; ++j) {
+                        char s[10];
+                        pj_ansi_snprintf(s, sizeof(s), "%d%s",
+                                         info.listeners[j],
+                                         (j==info.listener_cnt-1)?"":",");
+                        pj_ansi_strcat(li_list, s);
+                    }
+                    tr_list[0] = '\0';
+                    for (j=0; j<info.transmitter_cnt; ++j) {
+                        char s[10];
+                        pj_ansi_snprintf(s, sizeof(s), "%d%s",
+                                         info.transmitters[j],
+                                         (j==info.transmitter_cnt-1)?"":",");
+                        pj_ansi_strcat(tr_list, s);
+                    }
+                    pjmedia_fourcc_name(info.format.id, s);
+                    s[4] = ' ';
+                    pj_ansi_snprintf(s+5, sizeof(s)-5, "%dx%d@%.1f",
+                                     size->w, size->h,
+                                     (float)(fps->num*1.0/fps->denum));
+                    printf("%3d %.*s%.*s %s%.*s %s%.*s %s\n",
+                           id[i],
+                           (int)info.name.slen, info.name.ptr,
+                           22-(int)info.name.slen, "                   ",
+                           s,
+                           20-pj_ansi_strlen(s), "                    ",
+                           tr_list,
+                           12-pj_ansi_strlen(tr_list), "            ",
+                           li_list);
+                }
+            }
+        } else if (argc==5 && strcmp(argv[2], "cc")==0) {
+            int P, Q;
+            P = atoi(argv[3]);
+            Q = atoi(argv[4]);
+            pjsua_vid_conf_connect(P, Q, NULL);
+        } else if (argc==5 && strcmp(argv[2], "cd")==0) {
+            int P, Q;
+            P = atoi(argv[3]);
+            Q = atoi(argv[4]);
+            pjsua_vid_conf_disconnect(P, Q);
+        } else {
+            goto on_error;
+        }
     } else
         goto on_error;

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -4680 +4680 @@
             pjsua_vid_win_id        win_in;
 
-            /** The video capture device for outgoing transmission,
-             *  if any, or PJMEDIA_VID_INVALID_DEV
+            /**
+             * The video conference port number for the call in decoding
+             * direction.
+             */
+            pjsua_conf_port_id      dec_slot;
+
+            /**
+             * The video conference port number for the call in encoding
+             * direction.
+             */
+            pjsua_conf_port_id      enc_slot;
+
+            /**
+             * The video capture device for outgoing transmission,
+             * if any, or PJMEDIA_VID_INVALID_DEV
              */
             pjmedia_vid_dev_index   cap_dev;
@@ -5168 +5181 @@
  */
 PJ_DECL(pjsua_conf_port_id) pjsua_call_get_conf_port(pjsua_call_id call_id);
+
+
+/**
+ * Get the video window associated with the call. Note that this function
+ * will only evaluate the first video stream in the call, to query any other
+ * video stream, use pjsua_call_get_info().
+ *
+ * @param call_id       Call identification.
+ *
+ * @return              Video window, or PJSUA_INVALID_ID when the
+ *                      media has not been established or is not active.
+ */
+PJ_DECL(pjsua_vid_win_id) pjsua_call_get_vid_win(pjsua_call_id call_id);
+
+
+/**
+ * Get the video conference port identification associated with the call.
+ * Note that this function will only evaluate the first video stream in
+ * the call, to query any other video stream, use pjsua_call_get_info().
+ *
+ * @param call_id       Call identification.
+ * @param dir           Port direction to be queried. Valid values are
+ *                      PJMEDIA_DIR_ENCODING and PJMEDIA_DIR_DECODING only.
+ *
+ * @return              Conference port ID, or PJSUA_INVALID_ID when the
+ *                      media has not been established or is not active.
+ */
+PJ_DECL(pjsua_conf_port_id) pjsua_call_get_vid_conf_port(
+                                                    pjsua_call_id call_id,
+                                                    pjmedia_dir dir);
 
 /**
@@ -6704 +6747 @@
 
 /**
- * This structure descibes information about a particular media port that
+ * This structure describes information about a particular media port that
  * has been registered into the conference bridge. Application can query
  * this info by calling #pjsua_conf_get_port_info().
@@ -6741 +6784 @@
 
     /** Array of listeners (in other words, ports where this port is 
-     *  transmitting to.
+     *  transmitting to).
      */
     pjsua_conf_port_id  listeners[PJSUA_MAX_CONF_PORTS];
@@ -7808 +7851 @@
 
 /**
+ * Get video conference slot ID of the specified capture device, if any.
+ *
+ * @param id            The capture device ID.
+ *
+ * @return              The video conference slot ID of the specified capture
+ *                      device ID, or PJSUA_INVALID_ID if preview has not been
+ *                      started for the device.
+ */
+PJ_DECL(pjsua_conf_port_id) pjsua_vid_preview_get_vid_conf_port(
+                                                    pjmedia_vid_dev_index id);
+
+/**
  * Stop video preview.
  *
@@ -7843 +7898 @@
      */
     pjmedia_vid_dev_index rdr_dev;
+
+    /**
+     * Renderer port ID in the video conference bridge.
+     */
+    pjsua_conf_port_id slot_id;
 
     /**
@@ -8018 +8078 @@
 
 
+/*
+ * Video conference API
+ */
+
+/**
+ * This structure describes information about a particular video media port
+ * that has been registered into the video conference bridge. Application
+ * can query this info by calling #pjsua_vid_conf_get_port_info().
+ */
+typedef struct pjsua_vid_conf_port_info
+{
+    /** Conference port number. */
+    pjsua_conf_port_id  slot_id;
+
+    /** Port name. */
+    pj_str_t            name;
+
+    /** Format. */
+    pjmedia_format      format;
+
+    /** Number of listeners in the array. */
+    unsigned            listener_cnt;
+
+    /** Array of listeners (in other words, ports where this port is 
+     *  transmitting to).
+     */
+    pjsua_conf_port_id  listeners[PJSUA_MAX_CONF_PORTS];
+
+    /** Number of transmitters in the array. */
+    unsigned            transmitter_cnt;
+
+    /** Array of transmitters (in other words, ports where this port is 
+     *  receiving from).
+     */
+    pjsua_conf_port_id  transmitters[PJSUA_MAX_CONF_PORTS];
+
+} pjsua_vid_conf_port_info;
+
+
+/**
+ * Get current number of active ports in the bridge.
+ *
+ * @return              The number.
+ */
+PJ_DECL(unsigned) pjsua_vid_conf_get_active_ports(void);
+
+
+/**
+ * Enumerate all video conference ports.
+ *
+ * @param id            Array of conference port ID to be initialized.
+ * @param count         On input, specifies max elements in the array.
+ *                      On return, it contains actual number of elements
+ *                      that have been initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_enum_ports(pjsua_conf_port_id id[],
+                                               unsigned *count);
+
+
+/**
+ * Get information about the specified video conference port
+ *
+ * @param port_id       Port identification.
+ * @param info          Pointer to store the port info.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_get_port_info(
+                                            pjsua_conf_port_id port_id,
+                                            pjsua_vid_conf_port_info *info);
+
+
+/**
+ * Add arbitrary video media port to PJSUA's video conference bridge.
+ * Application can use this function to add the media port that it creates.
+ * For media ports that are created by PJSUA-LIB (such as calls, AVI player),
+ * PJSUA-LIB will automatically add the port to the bridge.
+ *
+ * @param pool          Pool to use.
+ * @param port          Media port to be added to the bridge.
+ * @param param         Currently this is not used and must be set to NULL.
+ * @param p_id          Optional pointer to receive the conference 
+ *                      slot id.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_add_port(pj_pool_t *pool,
+                                             pjmedia_port *port,
+                                             const void *param,
+                                             pjsua_conf_port_id *p_id);
+
+
+/**
+ * Remove arbitrary slot from the video conference bridge. Application should
+ * only call this function if it registered the port manually with previous
+ * call to #pjsua_vid_conf_add_port().
+ *
+ * @param port_id       The slot id of the port to be removed.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_remove_port(pjsua_conf_port_id port_id);
+
+
+/**
+ * Establish unidirectional video flow from souce to sink. One source
+ * may transmit to multiple destinations/sink. And if multiple
+ * sources are transmitting to the same sink, the video will be mixed
+ * together (currently, each source will be resized down so all sources will
+ * occupy the same portion in the sink video frame). Source and sink may
+ * refer to the same ID, effectively looping the media.
+ *
+ * If bidirectional media flow is desired, application needs to call
+ * this function twice, with the second one having the arguments
+ * reversed.
+ *
+ * @param source        Port ID of the source media/transmitter.
+ * @param sink          Port ID of the destination media/received.
+ * @param param         Currently this is not used and must be set to NULL.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_connect(pjsua_conf_port_id source,
+                                            pjsua_conf_port_id sink,
+                                            const void *param);
+
+
+/**
+ * Disconnect video flow from the source to destination port.
+ *
+ * @param source        Port ID of the source media/transmitter.
+ * @param sink          Port ID of the destination media/received.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_disconnect(pjsua_conf_port_id source,
+                                               pjsua_conf_port_id sink);
+
+
 
 /* end of VIDEO API */

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -60 +60 @@
         struct {
             pjmedia_vid_stream  *stream;    /**< The video stream.          */
+            pjsua_conf_port_id   strm_enc_slot; /**< Stream encode slot     */
+            pjsua_conf_port_id   strm_dec_slot; /**< Stream decode slot     */
             pjsua_vid_win_id     cap_win_id;/**< The video capture window   */
             pjsua_vid_win_id     rdr_win_id;/**< The video render window    */
@@ -404 +406 @@
     pjmedia_vid_port            *vp_cap;        /**< Capture vidport.   */
     pjmedia_vid_port            *vp_rend;       /**< Renderer vidport   */
-    pjmedia_port                *tee;           /**< Video tee          */
+    pjsua_conf_port_id           cap_slot;      /**< Capturer conf slot */
+    pjsua_conf_port_id           rend_slot;     /**< Renderer conf slot */
     pjmedia_vid_dev_index        preview_cap_id;/**< Capture dev id     */
     pj_bool_t                    preview_running;/**< Preview is started*/
@@ -513 +516 @@
     /* For keeping video device settings */
 #if PJSUA_HAS_VIDEO
+    pjmedia_vid_conf     *vid_conf;
     pj_uint32_t           vid_caps[PJMEDIA_VID_DEV_MAX_DEVS];
     pjmedia_vid_dev_param vid_param[PJMEDIA_VID_DEV_MAX_DEVS];

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -153 +153 @@
         call_med->strm.v.cap_win_id = PJSUA_INVALID_ID;
         call_med->strm.v.rdr_win_id = PJSUA_INVALID_ID;
+        call_med->strm.v.strm_dec_slot = PJSUA_INVALID_ID;
+        call_med->strm.v.strm_enc_slot = PJSUA_INVALID_ID;
         call_med->call = call;
         call_med->idx = i;
@@ -2224 +2226 @@
             info->media[info->media_cnt].stream.vid.win_in =
                                                 call_med->strm.v.rdr_win_id;
+
+            info->media[info->media_cnt].stream.vid.dec_slot =
+                                                call_med->strm.v.strm_dec_slot;
+            info->media[info->media_cnt].stream.vid.enc_slot =
+                                                call_med->strm.v.strm_enc_slot;
 
             if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1477 +1477 @@
                         call_med->last_req_keyframe = now;
                     }
+                }
+            }
+            break;
+
+        case PJMEDIA_EVENT_FMT_CHANGED:
+            if (call_med->strm.v.rdr_win_id != PJSUA_INVALID_ID) {
+                pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.rdr_win_id];
+                if (event->src == w->vp_rend) {
+                    /* Renderer just changed format, reconnect stream */
+                    pjsua_vid_conf_disconnect(call_med->strm.v.strm_dec_slot,
+                                              w->rend_slot);
+                    pjsua_vid_conf_connect(call_med->strm.v.strm_dec_slot,
+                                           w->rend_slot, NULL);
                 }
             }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -27 +27 @@
 
 #define ENABLE_EVENT            1
-#define VID_TEE_MAX_PORT        (PJSUA_MAX_CALLS + 1)
 
 #define PJSUA_SHOW_WINDOW       1
@@ -66 +65 @@
         PJ_PERROR(1,(THIS_FILE, status,
                      "Error creating PJMEDIA video codec manager"));
+        goto on_error;
+    }
+
+    status = pjmedia_vid_conf_create(pjsua_var.pool, NULL,
+                                     &pjsua_var.vid_conf);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(1,(THIS_FILE, status,
+                     "Error creating PJMEDIA video conference bridge"));
         goto on_error;
     }
@@ -139 +146 @@
             pjsua_var.win[i].pool = NULL;
         }
+    }
+
+    if (pjsua_var.vid_conf) {
+        pjmedia_vid_conf_destroy(pjsua_var.vid_conf);
+        pjsua_var.vid_conf = NULL;
     }
 
@@ -515 +527 @@
 }
 
+/*
+ * Get video conference slot ID of the specified capture device.
+ */
+PJ_DEF(pjsua_conf_port_id) pjsua_vid_preview_get_vid_conf_port(
+                                                    pjmedia_vid_dev_index id)
+{
+    pjsua_vid_win_id wid;
+    pjsua_vid_win *w;
+
+    wid = vid_preview_get_win(id, PJ_TRUE);
+    if (wid == PJSUA_INVALID_ID)
+        return PJSUA_INVALID_ID;
+
+    w = &pjsua_var.win[wid];
+    return w->cap_slot;
+}
+
+
 PJ_DEF(void) pjsua_vid_win_reset(pjsua_vid_win_id wid)
 {
@@ -528 +558 @@
 
 /* Allocate and initialize pjsua video window:
- * - If the type is preview, video capture, tee, and render
- *   will be instantiated.
- * - If the type is stream, only renderer will be created.
+ * - If the type is preview: capture port and render port
+ *   will be instantiated, and connected via conf.
+ * - If the type is stream: only render port will be created.
  */
 static pj_status_t create_vid_win(pjsua_vid_win_type type,
@@ -673 +703 @@
 
         /* Create capture video port */
-        vp_param.active = PJ_TRUE;
+        vp_param.active = PJ_FALSE;
         vp_param.vidparam.dir = PJMEDIA_DIR_CAPTURE;
 
@@ -703 +733 @@
         fmt = &fmt_;
 
-        /* Create video tee */
-        status = pjmedia_vid_tee_create(w->pool, fmt, VID_TEE_MAX_PORT,
-                                        &w->tee);
-        if (status != PJ_SUCCESS)
-            goto on_error;
-
-        /* Connect capturer to the video tee */
-        status = pjmedia_vid_port_connect(w->vp_cap, w->tee, PJ_FALSE);
+        /* Register capturer to the video conf */
+        status = pjsua_vid_conf_add_port(
+                                w->pool,
+                                pjmedia_vid_port_get_passive_port(w->vp_cap),
+                                NULL, &w->cap_slot);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -739 +766 @@
             goto on_error;
 
-        vp_param.active = (w->type == PJSUA_WND_TYPE_STREAM);
+        vp_param.active = PJ_FALSE;
         vp_param.vidparam.dir = PJMEDIA_DIR_RENDER;
         vp_param.vidparam.fmt = *fmt;
@@ -756 +783 @@
             goto on_error;
 
-        /* For preview window, connect capturer & renderer (via tee) */
+        /* Register renderer to the video conf */
+        status = pjsua_vid_conf_add_port(
+                                w->pool,
+                                pjmedia_vid_port_get_passive_port(w->vp_rend),
+                                NULL, &w->rend_slot);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* For preview window, connect capturer & renderer (via conf) */
         if (w->type == PJSUA_WND_TYPE_PREVIEW) {
-            pjmedia_port *rend_port;
-
-            rend_port = pjmedia_vid_port_get_passive_port(w->vp_rend);
-            status = pjmedia_vid_tee_add_dst_port2(w->tee, 0, rend_port);
+            status = pjsua_vid_conf_connect(w->cap_slot, w->rend_slot, NULL);
             if (status != PJ_SUCCESS)
                 goto on_error;
@@ -799 +831 @@
 
     if (w->vp_cap) {
+        pjsua_vid_conf_remove_port(w->cap_slot);
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, NULL,
                                   w->vp_cap);
         pjmedia_vid_port_stop(w->vp_cap);
-        pjmedia_vid_port_disconnect(w->vp_cap);
         pjmedia_vid_port_destroy(w->vp_cap);
     }
     if (w->vp_rend) {
+        pjsua_vid_conf_remove_port(w->rend_slot);
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, NULL,
                                   w->vp_rend);
@@ -811 +844 @@
         pjmedia_vid_port_destroy(w->vp_rend);
     }
-    if (w->tee) {
-        pjmedia_port_destroy(w->tee);
-    }
     pjsua_vid_win_reset(wid);
 
@@ -850 +880 @@
     call_med->strm.v.rdr_dev = acc->cfg.vid_rend_dev;
     call_med->strm.v.cap_dev = acc->cfg.vid_cap_dev;
+    call_med->strm.v.strm_dec_slot = PJSUA_INVALID_ID;
+    call_med->strm.v.strm_enc_slot = PJSUA_INVALID_ID;
     if (call_med->strm.v.rdr_dev == PJMEDIA_VID_DEFAULT_RENDER_DEV) {
         pjmedia_vid_dev_info info;
@@ -979 +1011 @@
             pj_log_push_indent();
 
+            /* Retrieve stream decoding port */
             status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
                                                  PJMEDIA_DIR_DECODING,
@@ -1010 +1043 @@
 #endif
             
-            /* Connect renderer to stream */
-            status = pjmedia_vid_port_connect(w->vp_rend, media_port,
-                                              PJ_FALSE);
+            /* Register renderer to stream events */
+            pjmedia_vid_port_subscribe_event(w->vp_rend, media_port);
+
+            /* Register stream decoding to conf, using tmp_pool should be fine
+             * as bridge will create its own pool (using tmp_pool factory).
+             */
+            status = pjsua_vid_conf_add_port(tmp_pool, media_port, NULL,
+                                             &call_med->strm.v.strm_dec_slot);
+            if (status != PJ_SUCCESS) {
+                pj_log_pop_indent();
+                goto on_error;
+            }
+
+            /* Connect stream to renderer (via conf) */
+            status = pjsua_vid_conf_connect(call_med->strm.v.strm_dec_slot,
+                                            w->rend_slot, NULL);
             if (status != PJ_SUCCESS) {
                 pj_log_pop_indent();
@@ -1042 +1088 @@
             pj_log_push_indent();
 
+            /* Retrieve stream encoding port */
             status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
                                                  PJMEDIA_DIR_ENCODING,
@@ -1079 +1126 @@
 #endif
             
-            /* Connect stream to capturer (via video window tee) */
-            status = pjmedia_vid_tee_add_dst_port2(w->tee, 0, media_port);
+            /* Register stream encoding to conf, using tmp_pool should be fine
+             * as bridge will create its own pool (using tmp_pool factory).
+             */
+            status = pjsua_vid_conf_add_port(tmp_pool, media_port, NULL,
+                                             &call_med->strm.v.strm_enc_slot);
+            if (status != PJ_SUCCESS) {
+                pj_log_pop_indent();
+                goto on_error;
+            }
+
+            /* Connect capturer to stream encoding (via conf) */
+            status = pjsua_vid_conf_connect(w->cap_slot,
+                                            call_med->strm.v.strm_enc_slot,
+                                            NULL);
             if (status != PJ_SUCCESS) {
                 pj_log_pop_indent();
@@ -1133 +1192 @@
     pj_log_push_indent();
     
+    /* Unregister video stream ports (encode+decode) from conference */
+    pjsua_vid_conf_remove_port(call_med->strm.v.strm_enc_slot);
+    pjsua_vid_conf_remove_port(call_med->strm.v.strm_dec_slot);
+
     pjmedia_vid_stream_send_rtcp_bye(strm);
 
     if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {
-        pjmedia_port *media_port;
         pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.cap_win_id];
-        pj_status_t status;
-
-        /* Stop the capture before detaching stream and unsubscribing event */
-        pjmedia_vid_port_stop(w->vp_cap);
-
-        /* Disconnect video stream from capture device */
-        status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
-                                             PJMEDIA_DIR_ENCODING,
-                                             &media_port);
-        if (status == PJ_SUCCESS) {
-            pjmedia_vid_tee_remove_dst_port(w->tee, media_port);
-        }
-
-        /* Unsubscribe event */
+
+        /* Unsubscribe event */
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
                                   w->vp_cap);
 
-        /* Re-start capture again, if it is used by other stream */
-        if (w->ref_cnt > 1)
-            pjmedia_vid_port_start(w->vp_cap);
-
+        /* Decrement ref count of preview video window */
         dec_vid_win(call_med->strm.v.cap_win_id);
         call_med->strm.v.cap_win_id = PJSUA_INVALID_ID;
@@ -1166 +1213 @@
         pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.rdr_win_id];
 
-        /* Stop the render before unsubscribing event */
+        /* Unsubscribe event, but stop the render first */
         pjmedia_vid_port_stop(w->vp_rend);
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
                                   w->vp_rend);
 
+        /* Decrement ref count of stream video window */
         dec_vid_win(call_med->strm.v.rdr_win_id);
         call_med->strm.v.rdr_win_id = PJSUA_INVALID_ID;
@@ -1432 +1480 @@
 
     wi->rdr_dev = vparam.rend_id;
+    wi->slot_id = w->rend_slot;
     wi->hwnd = vparam.window;
     wi->show = !vparam.window_hide;
@@ -2043 +2092 @@
         w->preview_cap_id = cap_dev;
         call_med->strm.v.cap_dev = cap_dev;
+        /* Yay, change capturer done! */
         return PJ_SUCCESS;
     }
 
-    /* No it doesn't support fast switching. Do slow switching then.. */
+    /* Oh no, it doesn't support fast switching. Do normal change then,
+     * i.e: remove the old and create a new capture.
+     */
     status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
                                          PJMEDIA_DIR_ENCODING, &media_port);
@@ -2055 +2107 @@
                               w->vp_cap);
     
-    /* temporarily disconnect while we operate on the tee. */
-    pjmedia_vid_port_disconnect(w->vp_cap);
-
-    /* = Detach stream port from the old capture device's tee = */
-    status = pjmedia_vid_tee_remove_dst_port(w->tee, media_port);
-    if (status != PJ_SUCCESS) {
-        /* Something wrong, assume that media_port has been removed
-         * and continue.
-         */
-        PJ_PERROR(4,(THIS_FILE, status,
-                     "Warning: call %d: unable to remove video from tee",
-                     call->index));
-    }
-
-    /* Reconnect again immediately. We're done with w->tee */
-    pjmedia_vid_port_connect(w->vp_cap, w->tee, PJ_FALSE);
+    /* Disconnect the old capture device to stream encoding port */
+    status = pjsua_vid_conf_disconnect(w->cap_slot,
+                                       call_med->strm.v.strm_enc_slot);
+    if (status != PJ_SUCCESS)
+        return status;
+
 
     /* = Attach stream port to the new capture device = */
@@ -2098 +2140 @@
     inc_vid_win(new_wid);
     new_w = &pjsua_var.win[new_wid];
-    
-    /* Connect stream to capturer (via video window tee) */
-    status = pjmedia_vid_tee_add_dst_port2(new_w->tee, 0, media_port);
-    if (status != PJ_SUCCESS)
-        goto on_error;
 
     if (new_w->vp_rend) {
@@ -2123 +2160 @@
     }
 
+    /* Connect capturer to stream encoding port (via conf) */
+    status = pjsua_vid_conf_connect(new_w->cap_slot,
+                                    call_med->strm.v.strm_enc_slot,
+                                    NULL);
+    if (status != PJ_SUCCESS)
+        goto on_error;
+
     /* Finally */
     call_med->strm.v.cap_dev = cap_dev;
@@ -2139 +2183 @@
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
                                   new_w->vp_cap);
-        /* Disconnect media port from the new capturer */
-        pjmedia_vid_tee_remove_dst_port(new_w->tee, media_port);
+
         /* Release the new capturer */
         dec_vid_win(new_wid);
@@ -2146 +2189 @@
 
     /* Revert back to the old capturer */
-    pjmedia_vid_port_disconnect(w->vp_cap);
-    status = pjmedia_vid_tee_add_dst_port2(w->tee, 0, media_port);
-    pjmedia_vid_port_connect(w->vp_cap, w->tee, PJ_FALSE);
+    status = pjsua_vid_conf_connect(w->cap_slot,
+                                    call_med->strm.v.strm_enc_slot, NULL);
     if (status != PJ_SUCCESS)
         return status;
@@ -2372 +2414 @@
 }
 
+
+/*****************************************************************************
+ * Video conference
+ */
+
+/*
+ * Get current number of active ports in the bridge.
+ */
+PJ_DEF(unsigned) pjsua_vid_conf_get_active_ports(void)
+{
+    return pjmedia_vid_conf_get_port_count(pjsua_var.vid_conf);
+}
+
+
+/*
+ * Enumerate all video conference ports.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_enum_ports( pjsua_conf_port_id id[],
+                                               unsigned *count)
+{
+    return pjmedia_vid_conf_enum_ports(pjsua_var.vid_conf,
+                                       (unsigned*)id, count);
+}
+
+
+/*
+ * Get information about the specified video conference port
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_get_port_info(
+                                            pjsua_conf_port_id port_id,
+                                            pjsua_vid_conf_port_info *info)
+{
+    pjmedia_vid_conf_port_info cinfo;
+    unsigned i;
+    pj_status_t status;
+
+    status = pjmedia_vid_conf_get_port_info(pjsua_var.vid_conf,
+                                            (unsigned)port_id, &cinfo);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    pj_bzero(info, sizeof(*info));
+    info->slot_id = port_id;
+    info->name = cinfo.name;
+    pjmedia_format_copy(&info->format, &cinfo.format);
+
+    /* Build array of listeners */
+    info->listener_cnt = cinfo.listener_cnt;
+    for (i=0; i<cinfo.listener_cnt; ++i) {
+        info->listeners[i] = cinfo.listener_slots[i];
+    }
+
+    /* Build array of transmitters */
+    info->transmitter_cnt = cinfo.transmitter_cnt;
+    for (i=0; i<cinfo.transmitter_cnt; ++i) {
+        info->transmitters[i] = cinfo.transmitter_slots[i];
+    }
+
+    return PJ_SUCCESS;
+
+}
+
+
+/*
+ * Add arbitrary video media port to PJSUA's video conference bridge.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_add_port( pj_pool_t *pool,
+                                             pjmedia_port *port,
+                                             const void *param,
+                                             pjsua_conf_port_id *p_id)
+{
+    pj_status_t status;
+
+    PJ_UNUSED_ARG(param);
+
+    status = pjmedia_vid_conf_add_port(pjsua_var.vid_conf, pool,
+                                       port, NULL, NULL, (unsigned*)p_id);
+    if (status != PJ_SUCCESS) {
+        if (p_id)
+            *p_id = PJSUA_INVALID_ID;
+    }
+
+    return status;
+}
+
+
+/*
+ * Remove arbitrary slot from the video conference bridge.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_remove_port(pjsua_conf_port_id id)
+{
+    return pjmedia_vid_conf_remove_port(pjsua_var.vid_conf, (unsigned)id);
+}
+
+
+/*
+ * Establish unidirectional video flow from souce to sink.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_connect( pjsua_conf_port_id source,
+                                            pjsua_conf_port_id sink,
+                                            const void *param)
+{
+    PJ_UNUSED_ARG(param);
+    return pjmedia_vid_conf_connect_port(pjsua_var.vid_conf, source, sink,
+                                         NULL);
+}
+
+
+/*
+ * Disconnect video flow from the source to destination port.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_disconnect(pjsua_conf_port_id source,
+                                              pjsua_conf_port_id sink)
+{
+    return pjmedia_vid_conf_disconnect_port(pjsua_var.vid_conf, source, sink);
+}
+
+/*
+ * Get the video window associated with the call.
+ */
+PJ_DEF(pjsua_vid_win_id) pjsua_call_get_vid_win(pjsua_call_id call_id)
+{
+    pjsua_call *call;
+    pjsua_vid_win_id wid = PJSUA_INVALID_ID;
+    unsigned i;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    /* Use PJSUA_LOCK() instead of acquire_call():
+     *  https://trac.pjsip.org/repos/ticket/1371
+     */
+    PJSUA_LOCK();
+
+    if (!pjsua_call_is_active(call_id))
+        goto on_return;
+
+    call = &pjsua_var.calls[call_id];
+    for (i = 0; i < call->med_cnt; ++i) {
+        if (call->media[i].type == PJMEDIA_TYPE_VIDEO &&
+            (call->media[i].dir & PJMEDIA_DIR_DECODING))
+        {
+            wid = call->media[i].strm.v.rdr_win_id;
+            break;
+        }
+    }
+
+on_return:
+    PJSUA_UNLOCK();
+
+    return wid;
+}
+
+
+/*
+ * Get the video conference port identification associated with the call.
+ */
+PJ_DEF(pjsua_conf_port_id) pjsua_call_get_vid_conf_port(
+                                                    pjsua_call_id call_id,
+                                                    pjmedia_dir dir)
+{
+    pjsua_call *call;
+    pjsua_conf_port_id port_id = PJSUA_INVALID_ID;
+    unsigned i;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(dir==PJMEDIA_DIR_ENCODING || dir==PJMEDIA_DIR_DECODING,
+                     PJ_EINVAL);
+
+    /* Use PJSUA_LOCK() instead of acquire_call():
+     *  https://trac.pjsip.org/repos/ticket/1371
+     */
+    PJSUA_LOCK();
+
+    if (!pjsua_call_is_active(call_id))
+        goto on_return;
+
+    call = &pjsua_var.calls[call_id];
+    for (i = 0; i < call->med_cnt; ++i) {
+        if (call->media[i].type == PJMEDIA_TYPE_VIDEO &&
+            (call->media[i].dir & dir))
+        {
+            port_id = (dir==PJMEDIA_DIR_ENCODING)?
+                                    call->media[i].strm.v.strm_enc_slot :
+                                    call->media[i].strm.v.strm_dec_slot;
+            break;
+        }
+    }
+
+on_return:
+    PJSUA_UNLOCK();
+
+    return port_id;
+}
+
+
 #endif /* PJSUA_HAS_VIDEO */