Changeset 6065 for pjproject

Timestamp:

Sep 6, 2019 5:20:32 AM (5 years ago)

Author:

nanang

Message:

Re #2228: Also updated PCM shifting in G722.1.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c (modified) (4 diffs)

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

@@ -168 +168 @@
     pj_uint16_t          frame_size_bits;   /**< Coded frame size in bits.  */
     pj_uint16_t          number_of_regions; /**< Number of regions.         */
-    int                  pcm_shift;         /**< Adjustment for PCM in/out  */
+    pj_int16_t           pcm_shift_val;     /**< Adjustment for PCM in/out  */
     
     /* Encoder specific state */
@@ -700 +700 @@
                                     (attr->info.clock_rate <= WB_SAMPLE_RATE?
                                      NUMBER_OF_REGIONS:MAX_NUMBER_OF_REGIONS);
-    codec_data->pcm_shift = codec_factory.pcm_shift;
+    codec_data->pcm_shift_val =  1 << (pj_int16_t)codec_factory.pcm_shift;
 
     /* Initialize encoder state */
@@ -845 +845 @@
 
         /* Encoder adjust the input signal level */
-        if (codec_data->pcm_shift) {
+        if (codec_data->pcm_shift_val > 1) {
             unsigned i;
             for (i=0; i<codec_data->samples_per_frame; ++i) {
                 codec_data->enc_frame[i] = 
-                        (Word16)(pcm_input[i] >> codec_data->pcm_shift);
+                        (Word16)(pcm_input[i] / codec_data->pcm_shift_val);
             }
             pcm_input = codec_data->enc_frame;
@@ -944 +944 @@
 
     /* Decoder adjust PCM signal */
-    if (codec_data->pcm_shift) {
+    if (codec_data->pcm_shift_val > 1) {
         unsigned i;
         pj_int16_t *buf = (Word16*)output->buf;
 
         for (i=0; i<codec_data->samples_per_frame; ++i) {
-            buf[i] <<= codec_data->pcm_shift;
+            buf[i] = buf[i] * codec_data->pcm_shift_val;
         }
     }