Changeset 3435 for pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/vid_streamutil.c

Timestamp:

Mar 2, 2011 8:37:31 AM (13 years ago)

Author:

nanang

Message:

Re #1182:

• Added remote frame-rate detection in to video stream.
• Fixed bitrate settings in ffmpeg codec.
• Fixed SDL dev to update internal SDL info when format changed.
• Minor fixes/updates, e.g:
  • added cleanup steps, fixed logs, etc, in sample app simpleua.c and vid_streamutil.c
  • fixed/added docs of the new APIs in the jitter buffer.

File:

• pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/vid_streamutil.c (modified) (8 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/vid_streamutil.c

@@ -126 +126 @@
 }
 
+/* 
+ * Register all codecs. 
+ */
+static void deinit_codecs()
+{
+#if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0
+    pjmedia_codec_ffmpeg_deinit();
+#endif
+}
+
 static pj_status_t create_file_player( pj_pool_t *pool,
                                        const char *file_name,
@@ -616 +626 @@
         file_vfd = pjmedia_format_get_video_format_detail(&play_port->info.fmt,
                                                           PJ_TRUE);
-        PJ_LOG(2, (THIS_FILE, "Reading video stream %dx%d %c%c%c%c @%.2dfps",
+        PJ_LOG(2, (THIS_FILE, "Reading video stream %dx%d %c%c%c%c @%.2ffps",
                    file_vfd->size.w, file_vfd->size.h,
                    ((play_port->info.fmt.id & 0x000000FF) >> 0),
@@ -622 +632 @@
                    ((play_port->info.fmt.id & 0x00FF0000) >> 16),
                    ((play_port->info.fmt.id & 0xFF000000) >> 24),
-                   file_vfd->fps.num/file_vfd->fps.denum));
+                   (1.0*file_vfd->fps.num/file_vfd->fps.denum)));
 
         /* Allocate file read buffer */
@@ -658 +668 @@
                 goto on_exit;
 
+            codec_param2.dir = PJMEDIA_DIR_DECODING;
             status = play_decoder->op->open(play_decoder, &codec_param2);
             if (status != PJ_SUCCESS)
@@ -706 +717 @@
                 goto on_exit;
 
-            pjmedia_format_copy(&vpp.vidparam.fmt, &codec_param.dec_fmt);
+            pjmedia_format_copy(&vpp.vidparam.fmt, &codec_param.enc_fmt);
+            vpp.vidparam.fmt.id = codec_param.dec_fmt.id;
             vpp.vidparam.dir = PJMEDIA_DIR_CAPTURE;
             
@@ -836 +848 @@
 
     if (dir & PJMEDIA_DIR_ENCODING)
-        PJ_LOG(2, (THIS_FILE, "Sending %dx%d %.*s @%.2dfps",
+        PJ_LOG(2, (THIS_FILE, "Sending %dx%d %.*s @%.2ffps",
                    codec_param.enc_fmt.det.vid.size.w,
                    codec_param.enc_fmt.det.vid.size.h,
                    codec_info->encoding_name.slen,
                    codec_info->encoding_name.ptr,
-                   codec_param.enc_fmt.det.vid.fps.num/
-                   codec_param.enc_fmt.det.vid.fps.denum));
+                   (1.0*codec_param.enc_fmt.det.vid.fps.num/
+                    codec_param.enc_fmt.det.vid.fps.denum)));
 
     for (;;) {
@@ -880 +892 @@
 
     /* Destroy file decoder */
-    if (play_decoder)
+    if (play_decoder) {
         play_decoder->op->close(play_decoder);
+        pjmedia_vid_codec_mgr_dealloc_codec(NULL, play_decoder);
+    }
 
     /* Destroy video devices */
@@ -899 +913 @@
     }
 
+    /* Deinit codecs */
+    deinit_codecs();
+
     /* Shutdown video subsystem */
     pjmedia_vid_subsys_shutdown();