Changeset 909:c7abe5d46b50 in mediastreamer2

Timestamp:

Mar 12, 2010 5:29:16 PM (3 years ago)

Author:

Jehan Monnier <jehan.monnier@…>

Branch:

default

Children:

910:f4f8118b46ff, 923:e2a0e6eb72d7

committer:

Jehan Monnier <jehan.monnier@linphone.org> 1268411516 -3600

Message:

add set gain in DB for MSVolume

Files:

• include/mediastreamer2/mscommon.h (modified) (1 diff)
• include/mediastreamer2/msvolume.h (modified) (1 diff)
• src/gsm.c (modified) (2 diffs)
• src/msvolume.c (modified) (3 diffs)

include/mediastreamer2/mscommon.h

@@ -174 +174 @@
  * Filters that generate data that can be sent through RTP should make packets
  * whose size is below ms_get_payload_max_size().
- * The default value is 1440 computed as the standart internet MTU minus IPv6 header,
+ * The default value is 1440 computed as the standard internet MTU minus IPv6 header,
  * UDP header and RTP header. As IPV4 header is smaller than IPv6 header, this 
  * value works for both.

include/mediastreamer2/msvolume.h

@@ -59 +59 @@
 #define MS_VOLUME_SET_NOISE_GATE_FLOORGAIN MS_FILTER_METHOD(MS_VOLUME_ID,12,float)
 
+/* set a gain in db */
+#define MS_VOLUME_SET_DB_GAIN           MS_FILTER_METHOD(MS_VOLUME_ID,13,float)
+
 extern MSFilterDesc ms_volume_desc;
 

src/gsm.c

@@ -48 +48 @@
         EncState *s=(EncState*)f->data;
         mblk_t *im;
-        int16_t buf[160];
+        int16_t buf[320];
         
         while((im=ms_queue_get(f->inputs[0]))!=NULL){
@@ -54 +54 @@
         }
         while(ms_bufferizer_read(s->bufferizer,(uint8_t*)buf,sizeof(buf))==sizeof(buf)) {
-                mblk_t *om=allocb(33,0);
+                mblk_t *om=allocb(66,0);
                 gsm_encode(s->state,(gsm_signal*)buf,(gsm_byte*)om->b_wptr);
+                om->b_wptr+=33;
+                gsm_encode(s->state,(gsm_signal*)(buf+160),(gsm_byte*)om->b_wptr);
                 om->b_wptr+=33;
                 mblk_set_timestamp_info(om,s->ts);

src/msvolume.c

@@ -107 +107 @@
         Volume *v=(Volume*)f->data;
         *farg=10*ortp_log10f((v->energy+1)/max_e);
-
         return 0;
 }
@@ -200 +199 @@
 }
 
+static int volume_set_db_gain(MSFilter *f, void *gain){
+        float *fgain=(float*)gain;
+        Volume *v=(Volume*)f->data;
+        v->gain=v->static_gain=v->target_gain = pow(10,(*fgain)/10);
+        ms_message("MSVolume set gain to [%f db], [%f] linear",*fgain,v->gain);
+        return 0;
+}
+
 static int volume_set_gain(MSFilter *f, void *arg){
         float *farg=(float*)arg;
@@ -392 +399 @@
         {       MS_VOLUME_SET_NOISE_GATE_THRESHOLD,     volume_set_noise_gate_threshold},
         {       MS_VOLUME_SET_NOISE_GATE_FLOORGAIN,     volume_set_noise_gate_floorgain},
+        {       MS_VOLUME_SET_DB_GAIN   ,       volume_set_db_gain              },
         {       0                       ,       NULL                    }
 };