Changeset 3401 for pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/format.h

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/include/pjmedia/format.h (modified) (1 diff)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/format.h

@@ -469 +469 @@
 }
 
+/**
+ * General utility routine to calculate ptime value from frame rate.
+ * Application should use this macro whenever possible due to possible
+ * overflow in the math calculation.
+ *
+ * @param frame_rate            Frame rate
+ *
+ * @return                      The ptime value (in usec).
+ */
+PJ_INLINE(unsigned) PJMEDIA_PTIME(const pjmedia_ratio *frame_rate)
+{
+#if PJ_HAS_INT64
+    return ((unsigned)((pj_uint64_t)1000000 * \
+                       frame_rate->denum / frame_rate->num));
+#elif PJ_HAS_FLOATING_POINT
+    return ((unsigned)(1000000.0 * frame_rate->denum / \
+                       frame_rate->num));
+#else
+    return ((unsigned)((1000L * frame_rate->denum / \
+                       frame_rate->num) * 1000);
+#endif
+}
 
 /**