Changeset 3416 for pjproject/trunk

Timestamp:

Feb 18, 2011 9:34:28 AM (14 years ago)

Author:

nanang

Message:

Fix #1199:

• Modified G722 frame time to 10ms (was 20ms) and frame per packet to 2 (was 1).
• Updated the detection mechanism of remote G722 frame-length in the stream to be flexible to any G722 frame length setting (was assumed to be always 20ms).

Location:

pjproject/trunk/pjmedia/src

Files:

• pjmedia-codec/g722.c (modified) (2 diffs)
• pjmedia/stream.c (modified) (3 diffs)

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

@@ -39 +39 @@
 
 /* Defines */
-#define PTIME                   (20)
+#define PTIME                   (10)
 #define SAMPLES_PER_FRAME       (16000 * PTIME /1000)
-#define FRAME_LEN               (160)
+#define FRAME_LEN               (80)
 #define PLC_DISABLED            0
 
@@ -292 +292 @@
     attr->info.pt = PJMEDIA_RTP_PT_G722;
 
-    attr->setting.frm_per_pkt = 1;
+    attr->setting.frm_per_pkt = 2;
     attr->setting.vad = 1;
     attr->setting.plc = 1;

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1719 +1719 @@
                 {
                     unsigned peer_frm_ts_diff;
-
+                    unsigned frm_ts_span;
+
+                    /* Calculate actual frame timestamp span */
+                    frm_ts_span = stream->port.info.samples_per_frame /
+                                  stream->codec_param.setting.frm_per_pkt/
+                                  stream->port.info.channel_count;
+
+                    /* Get remote frame timestamp span */
                     peer_frm_ts_diff = 
                         ((pj_uint32_t)ts.u64-stream->rtp_rx_last_ts) / 
                         stream->rtp_rx_last_cnt;
 
-                    /* Possibilities remote's samples per frame for G.722 
-                     * are only 160 and 320, this validation is needed
-                     * to avoid wrong decision because of silence frames.
+                    /* Possibilities remote's samples per frame for G.722
+                     * are only (frm_ts_span) and (frm_ts_span/2), this
+                     * validation is needed to avoid wrong decision because
+                     * of silence frames.
                      */
                     if (stream->codec_param.info.pt == PJMEDIA_RTP_PT_G722 &&
-                        (peer_frm_ts_diff==stream->port.info.samples_per_frame
-                         || peer_frm_ts_diff == 
-                                    stream->port.info.samples_per_frame >> 1))
+                        (peer_frm_ts_diff == frm_ts_span || 
+                         peer_frm_ts_diff == (frm_ts_span>>1)))
                     {
                         if (peer_frm_ts_diff < stream->rtp_rx_ts_len_per_frame)
@@ -1752 +1759 @@
 
             ts_span = stream->rtp_rx_ts_len_per_frame;
+
+            /* Adjust the timestamp of the parsed frames */
+            for (i=0; i<count; ++i) {
+                frames[i].timestamp.u64 = ts.u64 + ts_span * i;
+            }
 
         } else {
@@ -2141 +2153 @@
     stream->rtp_tx_ts_len_per_pkt = stream->enc_samples_per_pkt /
                                      stream->codec_param.info.channel_cnt;
-    stream->rtp_rx_ts_len_per_frame = stream->port.info.samples_per_frame / 
-                                       stream->codec_param.info.channel_cnt;
+    stream->rtp_rx_ts_len_per_frame = stream->port.info.samples_per_frame /
+                                      stream->codec_param.setting.frm_per_pkt /
+                                      stream->codec_param.info.channel_cnt;
 
     if (info->fmt.pt == PJMEDIA_RTP_PT_G722) {