Changeset 4027 for pjproject

Timestamp:

Apr 5, 2012 8:38:49 AM (13 years ago)

Author:

nanang

Message:

Misc (Re #1446): Add pjsua app video command for modifying video codec size/resolution.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)

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

@@ -3595 +3595 @@
     puts("| vid codec fps ID NUM DEN  Set codec ID framerate to (NUM/DEN) fps           |");
     puts("| vid codec bw ID AVG MAX   Set codec ID bitrate to AVG & MAX kbps            |");
+    puts("| vid codec size ID W H     Set codec ID size/resolution to W x H             |");
     puts("| vid win list              List all active video windows                     |");
     puts("| vid win arrange           Auto arrange windows                              |");
@@ -4262 +4263 @@
                 unsigned i;
                 PJ_LOG(3,(THIS_FILE, "Found %d video codecs:", count));
-                PJ_LOG(3,(THIS_FILE, "codec id      prio  fps   br(kbps)"));
-                PJ_LOG(3,(THIS_FILE, "----------------------------------"));
+                PJ_LOG(3,(THIS_FILE, "codec id      prio  fps    bw(kbps)   size"));
+                PJ_LOG(3,(THIS_FILE, "------------------------------------------"));
                 for (i=0; i<count; ++i) {
                     pjmedia_vid_codec_param cp;
@@ -4274 +4275 @@
                     vfd = pjmedia_format_get_video_format_detail(&cp.enc_fmt,
                                                                  PJ_TRUE);
-                    PJ_LOG(3,(THIS_FILE, "%.*s%.*s %3d %7.2f %d/%d", 
+                    PJ_LOG(3,(THIS_FILE, "%.*s%.*s %3d %7.2f  %4d/%4d  %dx%d", 
                               (int)ci[i].codec_id.slen, ci[i].codec_id.ptr,
                               13-(int)ci[i].codec_id.slen, "                ",
                               ci[i].priority,
                               (vfd->fps.num*1.0/vfd->fps.denum),
-                              vfd->avg_bps/1000, vfd->max_bps/1000));
+                              vfd->avg_bps/1000, vfd->max_bps/1000,
+                              vfd->size.w, vfd->size.h));
                 }
             }
@@ -4316 +4318 @@
                 cp.enc_fmt.det.vid.avg_bps = M * 1000;
                 cp.enc_fmt.det.vid.max_bps = N * 1000;
+                status = pjsua_vid_codec_set_param(&cid, &cp);
+            }
+            if (status != PJ_SUCCESS)
+                PJ_PERROR(1,(THIS_FILE, status, "Set codec bitrate error"));
+        } else if (argc==6 && strcmp(argv[2], "size")==0) {
+            pjmedia_vid_codec_param cp;
+            pj_str_t cid;
+            int M, N;
+            cid = pj_str(argv[3]);
+            M = atoi(argv[4]);
+            N = atoi(argv[5]);
+            status = pjsua_vid_codec_get_param(&cid, &cp);
+            if (status == PJ_SUCCESS) {
+                cp.enc_fmt.det.vid.size.w = M;
+                cp.enc_fmt.det.vid.size.h = N;
                 status = pjsua_vid_codec_set_param(&cid, &cp);
             }