Changeset 1111:e207f189903a in mediastreamer2

Timestamp:

Jul 9, 2010 11:34:39 AM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

implement PLC on speex decoder

File:

• src/msspeex.c (modified) (7 diffs)

src/msspeex.c

@@ -19 +19 @@
 
 #include "mediastreamer2/msfilter.h"
+#include "mediastreamer2/msticker.h"
 
 #include <speex/speex.h>
@@ -394 +395 @@
         int penh;
         int frsz;
-        uint32_t last_ts;
+        uint64_t sample_time;
         void *state;
 } DecState;
@@ -404 +405 @@
         s->state=NULL;
         s->penh=1;
-        s->last_ts=0;
+        s->sample_time=0;
         f->data=s;
 }
@@ -442 +443 @@
         if (s->penh==1)
                 speex_decoder_ctl (s->state, SPEEX_SET_ENH, &s->penh);
+        s->sample_time=0;
 }
 
@@ -463 +465 @@
         SpeexBits bits;
         int bytes=s->frsz*2;
+        bool_t bits_initd=FALSE;
         
-        speex_bits_init(&bits);
         while((im=ms_queue_get(f->inputs[0]))!=NULL){
-                uint32_t curts=mblk_get_timestamp_info(im);
                 int rem_bits=(im->b_wptr-im->b_rptr)*8;
+
+                if (s->sample_time==0){
+                        s->sample_time=f->ticker->time;
+                }
                 
-                speex_bits_reset(&bits);
+                if (!bits_initd) {
+                        speex_bits_init(&bits);
+                        bits_initd=TRUE;
+                }else speex_bits_reset(&bits);
+                
                 speex_bits_read_from(&bits,(char*)im->b_rptr,im->b_wptr-im->b_rptr);
                 
-
-#if 0 /* does not work very well, revisit later*/
-                /* packet loss concealment stuff, for one packet lost 
-                        A better algorithm would be needed to accomodate more
-                */
-                if (s->last_ts!=0){
-                        int ts_diff=(int)(curts-s->last_ts);
-                        if ( ts_diff>160){
-                                ms_message("Packet missing, trying loss concealment, ts_diff=%i",ts_diff);
-                                err=speex_decode_int(s->state,NULL,(int16_t*)om->b_wptr);
-                                om->b_wptr+=320;
-                        }
-                }
-#endif
                 /* support for multiple frame  in one RTP packet */
                 do{
@@ -491 +486 @@
                         err=speex_decode_int(s->state,&bits,(int16_t*)om->b_wptr);
                         om->b_wptr+=bytes;
-                        s->last_ts=curts+s->frsz;
+
                         if (err==0){
                                 ms_queue_put(f->outputs[0],om);
+                                s->sample_time+=20;
                         }else {
                                 if (err==-1)
@@ -504 +500 @@
                 freemsg(im);
         }
-        speex_bits_destroy(&bits);
+        if (s->sample_time!=0 && f->ticker->time>s->sample_time){
+                /* we should output a frame but no packet were decoded
+                 thus do packet loss concealment*/
+                om=allocb(bytes,0);
+                err=speex_decode_int(s->state,NULL,(int16_t*)om->b_wptr);
+                om->b_wptr+=bytes;
+                ms_queue_put(f->outputs[0],om);
+                ms_warning("Doing speex packet loss concealment.");
+                s->sample_time+=20;
+        }
+        if (bits_initd) speex_bits_destroy(&bits);
 }