Ignore:
Timestamp:
Mar 17, 2011 11:33:34 AM (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/format.h

    r3449 r3461  
    183183    PJMEDIA_FORMAT_H263     = PJMEDIA_FORMAT_PACK('H', '2', '6', '3'), 
    184184    PJMEDIA_FORMAT_H263P    = PJMEDIA_FORMAT_PACK('P', '2', '6', '3'), 
     185    PJMEDIA_FORMAT_H264     = PJMEDIA_FORMAT_PACK('H', '2', '6', '4'), 
    185186 
    186187    PJMEDIA_FORMAT_MJPEG    = PJMEDIA_FORMAT_PACK('M', 'J', 'P', 'G'), 
     
    443444                       clock_rate / channel_count / 1000000)); 
    444445#elif PJ_HAS_FLOATING_POINT 
    445     return ((unsigned)(usec_ptime * clock_rate / channel_count / 1000000.0)); 
     446    return ((unsigned)(1.0*usec_ptime * clock_rate / channel_count / 1000000)); 
    446447#else 
    447448    return ((unsigned)(usec_ptime / 1000L * clock_rate / \ 
     
    449450#endif 
    450451} 
     452 
     453/** 
     454 * Variant of #PJMEDIA_SPF() which takes frame rate instead of ptime. 
     455 */ 
     456PJ_INLINE(unsigned) PJMEDIA_SPF2(unsigned clock_rate, const pjmedia_ratio *fr, 
     457                                 unsigned channel_count) 
     458{ 
     459#if PJ_HAS_INT64 
     460    return ((unsigned)((pj_uint64_t)clock_rate * fr->num \ 
     461                       / fr->denum / channel_count)); 
     462#elif PJ_HAS_FLOATING_POINT 
     463    return ((unsigned)(1.0 * clock_rate * fr->num /fr->denum /channel_count)); 
     464#else 
     465    return ((unsigned)(1L * clock_rate * fr->num / fr->denum / channel_count)); 
     466#endif 
     467} 
     468 
    451469 
    452470/** 
Note: See TracChangeset for help on using the changeset viewer.