Changeset 438 for pjproject/trunk/pjmedia/src/pjmedia-codec/l16.c

Timestamp:

May 13, 2006 10:46:23 PM (18 years ago)

Author:

bennylp

Message:

Another major modifications in PJMEDIA:

• handle multiple frames in one packet
• split stream creation into two steps to allow customization
• PLC framework and implementation with G.711 and speex
• stream returns NO_FRAME correctly.
• added ptime argument in pjsua

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/l16.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/l16.c

@@ -62 +62 @@
                                pjmedia_codec_param *attr );
 static pj_status_t  l16_close( pjmedia_codec *codec );
-static pj_status_t  l16_get_frames(pjmedia_codec *codec,
-                                    void *pkt,
-                                    pj_size_t pkt_size,
-                                    unsigned *frame_cnt,
-                                    pjmedia_frame frames[]);
+static pj_status_t  l16_parse(pjmedia_codec *codec,
+                              void *pkt,
+                              pj_size_t pkt_size,
+                              const pj_timestamp *ts,
+                              unsigned *frame_cnt,
+                              pjmedia_frame frames[]);
 static pj_status_t  l16_encode( pjmedia_codec *codec, 
                                  const struct pjmedia_frame *input,
@@ -82 +83 @@
     &l16_open,
     &l16_close,
-    &l16_get_frames,
+    &l16_parse,
     &l16_encode,
     &l16_decode
@@ -235 +236 @@
 
     pj_memset(attr, 0, sizeof(pjmedia_codec_param));
-    attr->pt = id->pt;
-    attr->clock_rate = id->clock_rate;
-    attr->channel_cnt = id->channel_cnt;
-    attr->avg_bps = id->clock_rate * id->channel_cnt * 16;
-    attr->pcm_bits_per_sample = 16;
+    attr->info.pt = (pj_uint8_t)id->pt;
+    attr->info.clock_rate = id->clock_rate;
+    attr->info.channel_cnt = id->channel_cnt;
+    attr->info.avg_bps = id->clock_rate * id->channel_cnt * 16;
+    attr->info.pcm_bits_per_sample = 16;
 
     /* To keep frame size below 1400 MTU, set ptime to 10ms for
      * sampling rate > 35 KHz
      */
-    attr->ptime = GET_PTIME(id->clock_rate);
+    attr->info.frm_ptime = GET_PTIME(id->clock_rate);
+
+    attr->setting.frm_per_pkt = 1;
 
     /* Default all flag bits disabled. */
@@ -499 +502 @@
 }
 
-static pj_status_t  l16_get_frames( pjmedia_codec *codec,
-                                    void *pkt,
-                                    pj_size_t pkt_size,
-                                    unsigned *frame_cnt,
-                                    pjmedia_frame frames[])
+static pj_status_t  l16_parse( pjmedia_codec *codec,
+                               void *pkt,
+                               pj_size_t pkt_size,
+                               const pj_timestamp *ts,
+                               unsigned *frame_cnt,
+                               pjmedia_frame frames[])
 {
     unsigned count = 0;
@@ -512 +516 @@
 
     while (pkt_size >= data->frame_size && count < *frame_cnt) {
-        frames[0].type = PJMEDIA_FRAME_TYPE_AUDIO;
-        frames[0].buf = pkt;
-        frames[0].size = data->frame_size;
+        frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO;
+        frames[count].buf = pkt;
+        frames[count].size = data->frame_size;
+        frames[count].timestamp.u64 = ts->u64 + (count * data->frame_size);
 
         pkt = ((char*)pkt) + data->frame_size;