Changeset 3401 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/videoport.c

Timestamp:

Dec 20, 2010 11:02:48 AM (13 years ago)

Author:

ming

Message:

Fixed #1184:

• Move the AVI playback from pjmedia-test to new aviplay.c sample application
• Take the input file from cmdline
• Synchronize audio and video
• Remove all codecs related hardcodes from the file

Re #1193: (no. 6: duplicate fps and frame_rate in pjmedia_format and pjmedia_vid_param)

• Remove the frame_rate in pjmedia_vid_param
• Use pjmedia_format's fps in videoport, sdl_dev, and colorbar_dev
• Prevent overflow in ptime calculation from frame_rate

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/videoport.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/videoport.c

@@ -92 +92 @@
                                              pjmedia_vid_port **p_vid_port)
 {
-    enum { USEC_IN_SEC = 1000000 };
     pjmedia_vid_port *vp;
     pjmedia_vid_dev_index dev_id = PJMEDIA_VID_INVALID_DEV;
@@ -102 +101 @@
 
     PJ_ASSERT_RETURN(pool && prm && p_vid_port, PJ_EINVAL);
-    PJ_ASSERT_RETURN(prm->vidparam.frame_rate.num, PJ_EINVAL);
     PJ_ASSERT_RETURN(prm->vidparam.fmt.type == PJMEDIA_TYPE_VIDEO,
                      PJ_EINVAL);
@@ -110 +108 @@
     if (!vfd)
         return PJ_EINVAL;
+
+    PJ_ASSERT_RETURN(vfd->fps.num, PJ_EINVAL);
+
 
     /* Allocate videoport */
@@ -158 +159 @@
         if (vp->dir & PJMEDIA_DIR_ENCODING) {
             status = pjmedia_clock_create2(pool,
-                                           USEC_IN_SEC *
-                                              prm->vidparam.frame_rate.denum /
-                                              prm->vidparam.frame_rate.num,
+                                           PJMEDIA_PTIME(&vfd->fps),
                                            prm->vidparam.clock_rate,
                                            PJMEDIA_CLOCK_NO_HIGHEST_PRIO,
@@ -170 +169 @@
         if (vp->dir & PJMEDIA_DIR_DECODING) {
             status = pjmedia_clock_create2(pool,
-                                           USEC_IN_SEC *
-                                              prm->vidparam.frame_rate.denum /
-                                              prm->vidparam.frame_rate.num,
+                                           PJMEDIA_PTIME(&vfd->fps),
                                            prm->vidparam.clock_rate,
                                            PJMEDIA_CLOCK_NO_HIGHEST_PRIO,