Changeset 3637 for pjproject

Timestamp:

Jul 14, 2011 2:14:25 AM (13 years ago)

Author:

nanang

Message:

Re #1263: minor fixes:

• wrong boolean value to be used with PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE in pjsua_vid.c
• unupdated 'vid' commands in pjsua sample app

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3317 +3317 @@
     puts("| vid call tx on|off        Enable/disable video tx for current call          |");
     puts("| vid call add              Add video stream for current call                 |");
-    puts("| vid call remove N         Remove video stream #N for current call           |");
-    puts("| vid call modify N CAP     Modify capture dev of video stream #N             |");
+    puts("| vid call enable/disable N Enable/disable stream #N for current call         |");
+    puts("| vid call set-cap N ID     Set capture dev ID for stream #N for current call |");
     puts("| vid dev list              List all video devices                            |");
     puts("| vid dev refresh           Refresh video device list                         |");
@@ -3759 +3759 @@
         pjsua_call_vid_strm_op_param param;
 
-        if (strcmp(argv[2], "rx")==0) {
+        if (argc == 4 && strcmp(argv[2], "rx")==0) {
             pj_bool_t on = (strcmp(argv[3], "on") == 0);
             PJ_TODO(vid_enable_disable_video_RX_on_call);
             PJ_LOG(1,(THIS_FILE, "Not implemented"));
         }
-        else if (strcmp(argv[2], "tx")==0) {
+        else if (argc == 4 && strcmp(argv[2], "tx")==0) {
             pj_bool_t on = (strcmp(argv[3], "on") == 0);
             pjsua_call_vid_strm_op op = on? PJSUA_CALL_VID_STRM_START_TRANSMIT :
@@ -3770 +3770 @@
             pjsua_call_set_vid_strm(current_call, op, NULL);
         }
-        else if (strcmp(argv[2], "add")==0) {
+        else if (argc == 3 && strcmp(argv[2], "add")==0) {
             pjsua_call_set_vid_strm(current_call, PJSUA_CALL_VID_STRM_ADD, NULL);
         }
-        else if (strcmp(argv[2], "disable")==0 || strcmp(argv[2], "enable")==0) {
+        else if (argc == 4 && 
+                 (strcmp(argv[2], "disable")==0 || strcmp(argv[2], "enable")==0))
+        {
             pj_bool_t enable = (strcmp(argv[2], "enable") == 0);
             pjsua_call_vid_strm_op op = enable? PJSUA_CALL_VID_STRM_ENABLE :
@@ -3780 +3782 @@
             pjsua_call_set_vid_strm(current_call, op, &param);
         }
-        else if (strcmp(argv[2], "set-cap-dev")==0) {
+        else if (argc == 5 && strcmp(argv[2], "set-cap")==0) {
             param.med_idx = argc >= 4? atoi(argv[3]) : -1;
             param.cap_dev = argc >= 5? atoi(argv[4]) : PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
             pjsua_call_set_vid_strm(current_call, PJSUA_CALL_VID_STRM_CHANGE_CAP_DEV, &param);
-        }
+        } else
+            goto on_error;
     } else if (strcmp(argv[1], "dev")==0) {
         if (strcmp(argv[2], "list")==0) {

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -335 +335 @@
             if (show) {
                 pjmedia_vid_dev_stream *rdr;
+                pj_bool_t hide = PJ_FALSE;
                 
                 rdr = pjmedia_vid_port_get_stream(pjsua_var.win[wid].vp_rend);
@@ -341 +342 @@
                                         rdr,
                                         PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE,
-                                        &show);
+                                        &hide);
             }
 
@@ -926 +927 @@
     pjsua_vid_win *w;
     pjmedia_vid_dev_stream *s;
+    pj_bool_t hide;
     pj_status_t status;
 
@@ -943 +945 @@
     }
 
+    hide = !show;
     status = pjmedia_vid_dev_stream_set_cap(s,
-                            PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE, &show);
+                            PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE, &hide);
 
     PJSUA_UNLOCK();
@@ -1239 +1242 @@
         if (status != PJ_SUCCESS)
             goto on_error;
-
-        call_med->tp_st = PJSUA_MED_TP_INIT;
 
         /* Get transport address info */