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

Timestamp:

Jul 13, 2011 1:31:08 PM (13 years ago)

Author:

nanang

Message:

Re #1263:

• Break down the operation type PJSUA_CALL_VID_STRM_MODIFY into PJSUA_CALL_VID_STRM_ENABLE, PJSUA_CALL_VID_STRM_DISABLE, PJSUA_CALL_VID_STRM_CHANGE_CAP_DEV.
• Implemented video stream re-enabling (PJSUA_CALL_VID_STRM_ENABLE).

File:

• pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 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 [idx]     Remove video stream #idx 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 dev list              List all video devices                            |");
     puts("| vid dev refresh           Refresh video device list                         |");
@@ -3757 +3758 @@
     } else if (strcmp(argv[1], "call")==0) {
         pjsua_call_vid_strm_op_param param;
-        pj_bool_t tx = (strcmp(argv[2], "tx") == 0);
-        if (tx) {
+
+        if (strcmp(argv[2], "rx")==0) {
             pj_bool_t on = (strcmp(argv[3], "on") == 0);
-        }
-
-        if (strcmp(argv[2], "add")==0) {
+            PJ_TODO(vid_enable_disable_video_RX_on_call);
+            PJ_LOG(1,(THIS_FILE, "Not implemented"));
+        }
+        else if (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 :
+                                            PJSUA_CALL_VID_STRM_STOP_TRANSMIT;
+            pjsua_call_set_vid_strm(current_call, op, NULL);
+        }
+        else if (strcmp(argv[2], "add")==0) {
             pjsua_call_set_vid_strm(current_call, PJSUA_CALL_VID_STRM_ADD, NULL);
         }
-        if (strcmp(argv[2], "remove")==0) {
+        else if (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 :
+                                                PJSUA_CALL_VID_STRM_DISABLE;
             param.med_idx = argc >= 4? atoi(argv[3]) : -1;
-            pjsua_call_set_vid_strm(current_call, PJSUA_CALL_VID_STRM_REMOVE, &param);
-        }
-        PJ_TODO(vid_enable_disable_video_on_call);
-        PJ_LOG(1,(THIS_FILE, "Not implemented"));
+            pjsua_call_set_vid_strm(current_call, op, &param);
+        }
+        else if (strcmp(argv[2], "set-cap-dev")==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 if (strcmp(argv[1], "dev")==0) {
         if (strcmp(argv[2], "list")==0) {