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

Timestamp:

Jul 15, 2011 7:41:02 AM (13 years ago)

Author:

nanang

Message:

Re #1263:

• Replaced video stream operation DISABLE into REMOVE.
• Replaced video stream operation ENABLE into CHANGEDIR.
• Added new param: media direction, used in operation ADD and CHANGEDIR.
• Updated video stream operation START_TRANSMIT to ignore capture device param (as changing capture device is handled by CHANGE_CAP_DEV operation).

File:

• pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)

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

@@ -3324 +3324 @@
     puts("|                                                                             |");
     puts("| vid help                  Show this help screen                             |");
-    puts("| vid call rx on|off        Enable/disable incoming video for current call    |");
-    puts("| vid call tx on|off        Enable/disable video tx for current call          |");
+    puts("| vid call rx on|off N      Enable/disable video rx for stream N in curr call |");
+    puts("| vid call tx on|off N      Enable/disable video tx for stream N in curr call |");
     puts("| vid call add              Add video stream for current call                 |");
-    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 call enable/disable N Enable/disable stream #N in current call          |");
+    puts("| vid call set-cap N ID     Set capture dev ID for stream #N in current call  |");
     puts("| vid dev list              List all video devices                            |");
     puts("| vid dev refresh           Refresh video device list                         |");
@@ -3769 +3769 @@
         pjsua_call_vid_strm_op_param param;
 
-        if (argc == 4 && strcmp(argv[2], "rx")==0) {
+        if (argc == 5 && strcmp(argv[2], "rx")==0) {
+            pjsua_stream_info si;
             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"));
+
+            param.med_idx = atoi(argv[4]);
+            if (pjsua_call_get_stream_info(current_call, param.med_idx, &si) ||
+                si.type != PJMEDIA_TYPE_VIDEO)
+            {
+                PJ_PERROR(1,(THIS_FILE, PJ_EINVAL, "Invalid stream"));
+                return;
+            }
+
+            if (on) param.dir = (si.info.vid.dir | PJMEDIA_DIR_DECODING);
+            else param.dir = (si.info.vid.dir & PJMEDIA_DIR_ENCODING);
+
+            pjsua_call_set_vid_strm(current_call, PJSUA_CALL_VID_STRM_CHANGE_DIR, &param);
         }
-        else if (argc == 4 && strcmp(argv[2], "tx")==0) {
+        else if (argc == 5 && 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);
+
+            param.med_idx = atoi(argv[4]);
+
+            pjsua_call_set_vid_strm(current_call, op, &param);
         }
         else if (argc == 3 && strcmp(argv[2], "add")==0) {
             pjsua_call_set_vid_strm(current_call, PJSUA_CALL_VID_STRM_ADD, NULL);
         }
-        else if (argc == 4 && 
+        else if (argc >= 3 && 
                  (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;
+            pjsua_call_vid_strm_op op = enable? PJSUA_CALL_VID_STRM_CHANGE_DIR :
+                                                PJSUA_CALL_VID_STRM_REMOVE;
+
             param.med_idx = argc >= 4? atoi(argv[3]) : -1;
+            param.dir = PJMEDIA_DIR_ENCODING_DECODING;
             pjsua_call_set_vid_strm(current_call, op, &param);
         }
-        else if (argc == 5 && strcmp(argv[2], "set-cap")==0) {
+        else if (argc >= 3 && 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;
@@ -3798 +3815 @@
         } else
             goto on_error;
-    } else if (strcmp(argv[1], "dev")==0) {
+    } else if (argc >= 3 && strcmp(argv[1], "dev")==0) {
         if (strcmp(argv[2], "list")==0) {
             vid_list_devs();