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

Timestamp:

Mar 17, 2011 11:33:34 AM (11 years ago)

Author:

bennylp

Message:

Re #1215 (framework):

• vstream:
  • allow NULL pool parameter which means vstream will create one
  • Updated remote FPS detection to only be performed if decoder returns frame (however the FPS detection is currently disabled as some endpoints changes fps continuously, causing renderer restart continuously too).
• codec:
  • Updated video codec info to have RTP packetization support flag, also update endpoint in generating SDP to only include codecs whose RTP packetization support.
  • Added dynamic payload types for video codecs.
  • (minor) separate video PT into separate enum in pjmedia-codec/types.h
• H264 initial experiment.

generated frames (for libx264 sake).

• Replaced PJ_EUNKNOWN in some places with the appropriate error code.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/format.h (modified) (3 diffs)

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

@@ -183 +183 @@
     PJMEDIA_FORMAT_H263     = PJMEDIA_FORMAT_PACK('H', '2', '6', '3'),
     PJMEDIA_FORMAT_H263P    = PJMEDIA_FORMAT_PACK('P', '2', '6', '3'),
+    PJMEDIA_FORMAT_H264     = PJMEDIA_FORMAT_PACK('H', '2', '6', '4'),
 
     PJMEDIA_FORMAT_MJPEG    = PJMEDIA_FORMAT_PACK('M', 'J', 'P', 'G'),
@@ -443 +444 @@
                        clock_rate / channel_count / 1000000));
 #elif PJ_HAS_FLOATING_POINT
-    return ((unsigned)(usec_ptime * clock_rate / channel_count / 1000000.0));
+    return ((unsigned)(1.0*usec_ptime * clock_rate / channel_count / 1000000));
 #else
     return ((unsigned)(usec_ptime / 1000L * clock_rate / \
@@ -449 +450 @@
 #endif
 }
+
+/**
+ * Variant of #PJMEDIA_SPF() which takes frame rate instead of ptime.
+ */
+PJ_INLINE(unsigned) PJMEDIA_SPF2(unsigned clock_rate, const pjmedia_ratio *fr,
+                                 unsigned channel_count)
+{
+#if PJ_HAS_INT64
+    return ((unsigned)((pj_uint64_t)clock_rate * fr->num \
+                       / fr->denum / channel_count));
+#elif PJ_HAS_FLOATING_POINT
+    return ((unsigned)(1.0 * clock_rate * fr->num /fr->denum /channel_count));
+#else
+    return ((unsigned)(1L * clock_rate * fr->num / fr->denum / channel_count));
+#endif
+}
+
 
 /**