Changeset 5734 for pjproject/trunk/pjmedia/src/pjmedia-codec/opus.c

Timestamp:

Feb 12, 2018 6:18:22 AM (6 years ago)

Author:

ming

Message:

Fixed #2089: Support receiving Opus packets with various frame lengths

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/opus.c (modified) (12 diffs)

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

@@ -43 +43 @@
  */
 #define MAX_ENCODED_PACKET_SIZE         1280
+
+/* Default frame time (msec) */
+#define PTIME                   20
 
 /* Tracing */
@@ -137 +140 @@
     OpusRepacketizer            *dec_packer;
     pjmedia_codec_opus_config    cfg;
-    unsigned                     ptime;
+    unsigned                     enc_ptime;
+    unsigned                     dec_ptime;
     pjmedia_frame                dec_frame[2];
     int                          dec_frame_index;
@@ -150 +154 @@
     PJMEDIA_CODEC_OPUS_DEFAULT_SAMPLE_RATE,     /* Sample rate          */
     1,                                          /* Channel count        */
+    PTIME,                                      /* Frame time           */                      
     PJMEDIA_CODEC_OPUS_DEFAULT_BIT_RATE,        /* Bit rate             */
     5,                                          /* Expected packet loss */
@@ -387 +392 @@
     param->info.clock_rate = opus_cfg.sample_rate = cfg->sample_rate;
     param->info.max_bps = opus_cfg.sample_rate * 2;
+    param->info.frm_ptime = opus_cfg.frm_ptime = cfg->frm_ptime;
 
     /* Set channel count */
@@ -468 +474 @@
     attr->info.avg_bps             = opus_cfg.bit_rate;
     attr->info.max_bps             = opus_cfg.sample_rate * 2;
-    attr->info.frm_ptime           = 20;
+    attr->info.frm_ptime           = opus_cfg.frm_ptime;
     attr->setting.frm_per_pkt      = 1;
     attr->info.pcm_bits_per_sample = 16;
@@ -601 +607 @@
     opus_data->cfg.sample_rate = attr->info.clock_rate;
     opus_data->cfg.channel_cnt = attr->info.channel_cnt;
-    opus_data->ptime       = attr->info.frm_ptime;
+    opus_data->enc_ptime = opus_data->dec_ptime = attr->info.frm_ptime;
 
     /* Allocate memory used by the codec */
@@ -815 +821 @@
     }
 
-    samples_per_frame = (opus_data->cfg.sample_rate *
-                         opus_data->ptime) / 1000;
-
     pj_memcpy(tmp_buf, pkt, pkt_size);
 
@@ -837 +840 @@
         frames[i].buf = ((char*)pkt) + out_pos;
         frames[i].size = size;
+        frames[i].bit_info = opus_packet_get_nb_samples(frames[i].buf,
+                             frames[i].size, opus_data->cfg.sample_rate);
+
+        if (i == 0) {
+            unsigned ptime = frames[i].bit_info * 1000 /
+                             opus_data->cfg.sample_rate;
+            if (ptime != opus_data->dec_ptime) {
+                PJ_LOG(4, (THIS_FILE, "Opus ptime change detected: %d ms "
+                                      "--> %d ms",
+                                      opus_data->dec_ptime, ptime));
+                opus_data->dec_ptime = ptime;
+                opus_data->dec_frame_index = -1;
+
+                /* Signal to the stream about ptime change. */
+                frames[i].bit_info |= 0x10000;
+            }
+            samples_per_frame = frames[i].bit_info;
+        }
+
         frames[i].timestamp.u64 = ts->u64 + i * samples_per_frame;
         out_pos += size;
@@ -867 +889 @@
 
     samples_per_frame = (opus_data->cfg.sample_rate *
-                         opus_data->ptime) / 1000;
+                         opus_data->enc_ptime) / 1000;
     frame_size = samples_per_frame * opus_data->cfg.channel_cnt *
                  sizeof(opus_int16);
@@ -982 +1004 @@
         frm_size = PJ_MIN(frm_size,
                           opus_data->cfg.sample_rate *
-                          opus_data->ptime / 1000);
+                          opus_data->dec_ptime / 1000);
     }
     decoded_samples = opus_decode( opus_data->dec,
@@ -1042 +1064 @@
         /* Recover the first packet? Don't think so, fill it with zeroes. */
         pj_uint16_t samples_per_frame;
-        samples_per_frame = (pj_uint16_t)(opus_data->cfg.sample_rate * 
-                                          opus_data->ptime) / 1000;
+        samples_per_frame = opus_data->cfg.sample_rate * opus_data->dec_ptime/
+                            1000;
         output->type = PJMEDIA_FRAME_TYPE_AUDIO;
         output->size = samples_per_frame << 1;
@@ -1057 +1079 @@
     if (inframe->type != PJMEDIA_FRAME_TYPE_AUDIO) {
         frm_size = PJ_MIN(frm_size, opus_data->cfg.sample_rate *
-                          opus_data->ptime/1000);
+                          opus_data->dec_ptime/1000);
     }
     decoded_samples = opus_decode(opus_data->dec,