diff options
Diffstat (limited to 'pjmedia/src/pjmedia-codec/g722')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/g722/g722_dec.c | 5 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/g722/g722_enc.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/pjmedia/src/pjmedia-codec/g722/g722_dec.c index 887fcb93..1579d06e 100644 --- a/pjmedia/src/pjmedia-codec/g722/g722_dec.c +++ b/pjmedia/src/pjmedia-codec/g722/g722_dec.c @@ -504,7 +504,6 @@ PJ_DEF(pj_status_t) g722_dec_decode( g722_dec_t *dec, unsigned i; int ilowr, ylow, rlow, dlowt; int ihigh, rhigh, dhigh; - int pcm1, pcm2; pj_uint8_t *in_ = (pj_uint8_t*) in; PJ_ASSERT_RETURN(dec && in && in_size && out && nsamples, PJ_EINVAL); @@ -529,9 +528,7 @@ PJ_DEF(pj_status_t) g722_dec_decode( g722_dec_t *dec, dec->shigh = block4h (dec, dhigh) ; /* 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]); } *nsamples = in_size << 1; diff --git a/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/pjmedia/src/pjmedia-codec/g722/g722_enc.c index b4ca63ce..d4b5ab87 100644 --- a/pjmedia/src/pjmedia-codec/g722/g722_enc.c +++ b/pjmedia/src/pjmedia-codec/g722/g722_enc.c @@ -543,7 +543,7 @@ PJ_DEF(pj_status_t) g722_enc_encode( g722_enc_t *enc, PJ_ASSERT_RETURN(*out_size >= (nsamples >> 1), PJ_ETOOSMALL); for(i = 0; i < nsamples; i += 2) { - tx_qmf(enc, in[i]>>2, in[i+1]>>2, &xlow, &xhigh); + tx_qmf(enc, in[i], in[i+1], &xlow, &xhigh); /* low band encoder */ ilow = block1l (xlow, enc->slow, enc->detlow) ; |