Changeset 3819 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Oct 18, 2011 1:51:01 AM (13 years ago)

Author:

nanang

Message:

Reenable ffmpeg H264 (re #1390):

• Review H264 codec settings such as profile, level, NAL unit size, bitrate, quality, latency.
• Added new format PJMEDIA_FORMAT_GBRP, 24 bits planar RGB, one of the formats outputted by the latest ffmpeg H264 decoder.
• Fixed format change detection bug in ffmpeg wrapper, decoder didn't update its internal state with the new format so format change event was generated in every decoding operation.
• Added compile time configurations for enabling/disabling ffmpeg codec H263+ & H264.
• Updated pjsua app to adjust window size to original video size. With H264, default window size will be too big as it is init'd with default H264 video size, e.g: 720x480 for profile level 30.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)

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

@@ -3195 +3195 @@
 {
     char event_name[5];
-    PJ_UNUSED_ARG(call_id);
-    PJ_UNUSED_ARG(med_idx);
-    PJ_LOG(4,(THIS_FILE, "Event %s",
+
+    PJ_LOG(5,(THIS_FILE, "Event %s",
               pjmedia_fourcc_name(event->type, event_name)));
+
+    if (event->type == PJMEDIA_EVENT_FMT_CHANGED) {
+        /* Adjust renderer window size to original video size */
+        pjsua_call_info ci;
+        pjsua_vid_win_id wid;
+        pjmedia_rect_size size;
+
+        pjsua_call_get_info(call_id, &ci);
+
+        if ((ci.media[med_idx].type == PJMEDIA_TYPE_VIDEO) &&
+            (ci.media[med_idx].dir & PJMEDIA_DIR_DECODING))
+        {
+            wid = ci.media[med_idx].stream.vid.win_in;
+            size = event->data.fmt_changed.new_fmt.det.vid.size;
+            pjsua_vid_win_set_size(wid, &size);
+        }
+    }
 }