Changeset 2543 for pjproject/branches/1.0

Timestamp:

Mar 23, 2009 1:22:45 PM (15 years ago)

Author:

nanang

Message:

Ticket #721: back-porting ticket #720

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-codec/ipp_codecs.c (modified) (1 diff)
• pjmedia/src/pjmedia-codec/l16.c (modified) (1 diff)
• pjmedia/src/pjmedia/stream.c (modified) (2 diffs)

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

@@ -1048 +1048 @@
             goto on_error;
 
-        s->enc_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR;
+        s->enc_setting.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR);
         s->enc_setting.octet_aligned = octet_align;
         s->enc_setting.reorder = PJ_TRUE;
         s->enc_setting.cmr = 15;
         
-        s->dec_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR;
+        s->dec_setting.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR);
         s->dec_setting.octet_aligned = octet_align;
         s->dec_setting.reorder = PJ_TRUE;

pjproject/branches/1.0/pjmedia/src/pjmedia-codec/l16.c

@@ -422 +422 @@
         /* 48KHz stereo */
         codecs[count].type = PJMEDIA_TYPE_AUDIO;
-        codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_MONO;
+        codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_STEREO;
         codecs[count].encoding_name = STR_L16;
         codecs[count].clock_rate = 48000;

pjproject/branches/1.0/pjmedia/src/pjmedia/stream.c

@@ -53 +53 @@
     unsigned                pt;             /**< Payload type.              */
     pj_bool_t               paused;         /**< Paused?.                   */
-    unsigned                in_pkt_size;    /**< Size of input buffer.      */
-    void                   *in_pkt;         /**< Input buffer.              */
     unsigned                out_pkt_size;   /**< Size of output buffer.     */
     void                   *out_pkt;        /**< Output buffer.             */
@@ -1394 +1392 @@
     channel->paused = 1;
     channel->pt = pt;
-
-    /* Allocate buffer for incoming packet. */
-
-    channel->in_pkt_size = PJMEDIA_MAX_MTU;
-    channel->in_pkt = pj_pool_alloc( pool, channel->in_pkt_size );
-    PJ_ASSERT_RETURN(channel->in_pkt != NULL, PJ_ENOMEM);