Changeset 3694

Timestamp:

Aug 15, 2011 9:38:42 AM (12 years ago)

Author:

bennylp

Message:

Re #1263 (Video API):

• Added PJSUA_CALL_VID_STRM_NO_OP to occupy value 0 for the enum
• Added pjsua_call_vid_strm_op_param_default() to initialize pjsua_call_vid_strm_op_param
• Renamed pjsua_call_get_transport_info() to pjsua_call_get_med_transport_info()

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (4 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (3 diffs)

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

@@ -3779 +3779 @@
         pjsua_call_vid_strm_op_param param;
 
+        pjsua_call_vid_strm_op_param_default(&param);
+
         if (argc == 5 && strcmp(argv[2], "rx")==0) {
             pjsua_stream_info si;

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

@@ -3304 +3304 @@
 {
     /**
+     * No operation
+     */
+    PJSUA_CALL_VID_STRM_NO_OP,
+
+    /**
      * Add a new video stream. This will add a new m=video line to
      * the media, regardless of whether existing video is/are present
@@ -3351 +3356 @@
 
 /**
- * Parameters for video stream operation on a call.
+ * Parameters for video stream operation on a call. Application should
+ * use #pjsua_call_vid_strm_op_param_default() to initialize this structure
+ * with its default values.
  */
 typedef struct pjsua_call_vid_strm_op_param
@@ -3386 +3393 @@
      * PJSUA_CALL_VID_STRM_ADD and PJSUA_CALL_VID_STRM_CHANGE_CAP_DEV.
      *
-     * Default: capture device configured in account.
+     * Default: PJMEDIA_VID_DEFAULT_CAPTURE_DEV.
      */
     pjmedia_vid_dev_index cap_dev;
 
 } pjsua_call_vid_strm_op_param;
+
+
+/**
+ * Initialize video stream operation param with default values.
+ *
+ * @param param         The video stream operation param to be initialized.
+ */
+PJ_DECL(void)
+pjsua_call_vid_strm_op_param_default(pjsua_call_vid_strm_op_param *param);
 
 
@@ -3889 +3905 @@
  * @return              PJ_SUCCESS on success or the appropriate error.
  */
-PJ_DECL(pj_status_t) pjsua_call_get_transport_info(pjsua_call_id call_id,
-                                                   unsigned med_idx,
-                                                   pjmedia_transport_info *t);
+PJ_DECL(pj_status_t) 
+pjsua_call_get_med_transport_info(pjsua_call_id call_id,
+                                  unsigned med_idx,
+                                  pjmedia_transport_info *t);
 
 

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

@@ -1537 +1537 @@
  * Get media transport info for the specified media index.
  */
-PJ_DEF(pj_status_t) pjsua_call_get_transport_info( pjsua_call_id call_id,
-                                                   unsigned med_idx,
-                                                   pjmedia_transport_info *t)
+PJ_DEF(pj_status_t) 
+pjsua_call_get_med_transport_info(pjsua_call_id call_id,
+                                  unsigned med_idx,
+                                  pjmedia_transport_info *t)
 {
     pjsua_call *call;

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

@@ -108 +108 @@
 }
 
+PJ_DEF(void)
+pjsua_call_vid_strm_op_param_default(pjsua_call_vid_strm_op_param *param)
+{
+    pj_bzero(param, sizeof(*param));
+    param->med_idx = -1;
+    param->dir = PJMEDIA_DIR_ENCODING_DECODING;
+    param->cap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
+}
 
 /*****************************************************************************
@@ -1561 +1569 @@
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
                      PJ_EINVAL);
+    PJ_ASSERT_RETURN(op != PJSUA_CALL_VID_STRM_NO_OP, PJ_EINVAL);
 
     PJSUA_LOCK();
@@ -1569 +1578 @@
         param_ = *param;
     } else {
-        param_.med_idx = -1;
-        param_.cap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
-        param_.dir = PJMEDIA_DIR_ENCODING_DECODING;
+        pjsua_call_vid_strm_op_param_default(&param_);
     }