Changeset 3202 for pjproject/trunk/pjmedia/src/pjmedia-codec/g722/g722_dec.c

Timestamp:

Jun 11, 2010 1:38:42 PM (14 years ago)

Author:

nanang

Message:

Close #1072:

• Added API pjmedia_codec_g722_set_pcm_shift() to enable configurable level-adjusment setting.
• Also added macro PJMEDIA_G722_DEFAULT_PCM_SHIFT (default value is 2) to accomplish 14-16 bit PCM conversion for G722 input/output.
• Added a feature in G722 to stop level-adjusment/PCM-shifting when clipping occured, compile-time configurable via PJMEDIA_G722_STOP_PCM_SHIFT_ON_CLIPPING macro.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/g722/g722_dec.c (modified) (2 diffs)

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

@@ -505 +505 @@
     int ilowr, ylow, rlow, dlowt;
     int ihigh, rhigh, dhigh;
-    int pcm1, pcm2;
     pj_uint8_t *in_ = (pj_uint8_t*) in;
 
@@ -530 +529 @@
         /* rhigh <= output high band pcm */
 
-        rx_qmf(dec, rlow, rhigh, &pcm1, &pcm2);
-        out[i*2] = (pj_int16_t)(pcm1 << 2);
-        out[i*2+1] = (pj_int16_t)(pcm2 << 2);
+        rx_qmf(dec, rlow, rhigh, &out[i*2], &out[i*2+1]);
     }