Changeset 5728

Timestamp:

Jan 18, 2018 4:02:00 AM (7 years ago)

Author:

ming

Message:

Fixed #2084: Opus decode/recovery issue when FEC or PLC is enabled

File:

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

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

@@ -933 +933 @@
     pjmedia_frame *inframe;
     int fec = 0;
+    int frm_size;
 
     PJ_UNUSED_ARG(output_buf_len);
@@ -969 +970 @@
         pj_memcpy(inframe->buf, input->buf, input->size);
         fec = 1;
-     }
-
-     decoded_samples = opus_decode(opus_data->dec,
+    }
+
+    /* From Opus doc: In the case of PLC (data==NULL) or FEC(decode_fec=1),
+     * then frame_size needs to be exactly the duration of audio that
+     * is missing.
+     */
+    if (inframe->type != PJMEDIA_FRAME_TYPE_AUDIO || fec) {
+        frm_size = opus_data->cfg.sample_rate * opus_data->ptime / 1000;
+    } else {
+        frm_size = output->size / (sizeof(opus_int16) *
+                   opus_data->cfg.channel_cnt);
+    }
+    decoded_samples = opus_decode( opus_data->dec,
                                    inframe->type==PJMEDIA_FRAME_TYPE_AUDIO ?
                                    inframe->buf : NULL,
@@ -977 +988 @@
                                    inframe->size : 0,
                                    (opus_int16*)output->buf,
-                                   output->size / (sizeof(opus_int16) *
-                                   opus_data->cfg.channel_cnt),
+                                   frm_size,
                                    fec);
-     output->timestamp = inframe->timestamp;
+    output->timestamp = inframe->timestamp;
      
-     if (inframe->type == PJMEDIA_FRAME_TYPE_AUDIO) {
+    if (inframe->type == PJMEDIA_FRAME_TYPE_AUDIO) {
         /* Mark current indexed frame as invalid */
         inframe->type = PJMEDIA_FRAME_TYPE_NONE;
@@ -1022 +1032 @@
     int decoded_samples;
     pjmedia_frame *inframe;
+    int frm_size;
 
     PJ_UNUSED_ARG(output_buf_len);
@@ -1040 +1051 @@
 
     inframe = &opus_data->dec_frame[opus_data->dec_frame_index];
+    if (inframe->type != PJMEDIA_FRAME_TYPE_AUDIO) {
+        frm_size = opus_data->cfg.sample_rate * opus_data->ptime/1000;
+    } else {
+        frm_size = output->size / (sizeof(opus_int16) *
+                   opus_data->cfg.channel_cnt);
+    }
     decoded_samples = opus_decode(opus_data->dec,
                                   inframe->type==PJMEDIA_FRAME_TYPE_AUDIO ?
@@ -1046 +1063 @@
                                   inframe->size : 0,
                                   (opus_int16*)output->buf,
-                                  output->size / (sizeof(opus_int16) *
-                                  opus_data->cfg.channel_cnt),
+                                  frm_size,
                                   0);