Changeset 2543


Ignore:
Timestamp:
Mar 23, 2009 1:22:45 PM (11 years ago)
Author:
nanang
Message:

Ticket #721: back-porting ticket #720

Location:
pjproject/branches/1.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.0

  • pjproject/branches/1.0/pjmedia/src/pjmedia-codec/ipp_codecs.c

    r2412 r2543  
    10481048            goto on_error; 
    10491049 
    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); 
    10511051        s->enc_setting.octet_aligned = octet_align; 
    10521052        s->enc_setting.reorder = PJ_TRUE; 
    10531053        s->enc_setting.cmr = 15; 
    10541054         
    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); 
    10561056        s->dec_setting.octet_aligned = octet_align; 
    10571057        s->dec_setting.reorder = PJ_TRUE; 
  • pjproject/branches/1.0/pjmedia/src/pjmedia-codec/l16.c

    r2394 r2543  
    422422        /* 48KHz stereo */ 
    423423        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; 
    425425        codecs[count].encoding_name = STR_L16; 
    426426        codecs[count].clock_rate = 48000; 
  • pjproject/branches/1.0/pjmedia/src/pjmedia/stream.c

    r2478 r2543  
    5353    unsigned                pt;             /**< Payload type.              */ 
    5454    pj_bool_t               paused;         /**< Paused?.                   */ 
    55     unsigned                in_pkt_size;    /**< Size of input buffer.      */ 
    56     void                   *in_pkt;         /**< Input buffer.              */ 
    5755    unsigned                out_pkt_size;   /**< Size of output buffer.     */ 
    5856    void                   *out_pkt;        /**< Output buffer.             */ 
     
    13941392    channel->paused = 1; 
    13951393    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); 
    14021394 
    14031395     
Note: See TracChangeset for help on using the changeset viewer.