Changeset 2543 for pjproject/branches/1.0
- Timestamp:
- Mar 23, 2009 1:22:45 PM (16 years ago)
- Location:
- pjproject/branches/1.0
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/1.0
- Property svn:mergeinfo changed
/pjproject/trunk merged: 2446,2509,2516
- Property svn:mergeinfo changed
-
pjproject/branches/1.0/pjmedia/src/pjmedia-codec/ipp_codecs.c
r2412 r2543 1048 1048 goto on_error; 1049 1049 1050 s->enc_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR;1050 s->enc_setting.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR); 1051 1051 s->enc_setting.octet_aligned = octet_align; 1052 1052 s->enc_setting.reorder = PJ_TRUE; 1053 1053 s->enc_setting.cmr = 15; 1054 1054 1055 s->dec_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR;1055 s->dec_setting.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR); 1056 1056 s->dec_setting.octet_aligned = octet_align; 1057 1057 s->dec_setting.reorder = PJ_TRUE; -
pjproject/branches/1.0/pjmedia/src/pjmedia-codec/l16.c
r2394 r2543 422 422 /* 48KHz stereo */ 423 423 codecs[count].type = PJMEDIA_TYPE_AUDIO; 424 codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_ MONO;424 codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_STEREO; 425 425 codecs[count].encoding_name = STR_L16; 426 426 codecs[count].clock_rate = 48000; -
pjproject/branches/1.0/pjmedia/src/pjmedia/stream.c
r2478 r2543 53 53 unsigned pt; /**< Payload type. */ 54 54 pj_bool_t paused; /**< Paused?. */ 55 unsigned in_pkt_size; /**< Size of input buffer. */56 void *in_pkt; /**< Input buffer. */57 55 unsigned out_pkt_size; /**< Size of output buffer. */ 58 56 void *out_pkt; /**< Output buffer. */ … … 1394 1392 channel->paused = 1; 1395 1393 channel->pt = pt; 1396 1397 /* Allocate buffer for incoming packet. */1398 1399 channel->in_pkt_size = PJMEDIA_MAX_MTU;1400 channel->in_pkt = pj_pool_alloc( pool, channel->in_pkt_size );1401 PJ_ASSERT_RETURN(channel->in_pkt != NULL, PJ_ENOMEM);1402 1394 1403 1395
Note: See TracChangeset
for help on using the changeset viewer.