diff options
Diffstat (limited to 'gr-vocoder/lib/codec2_decode_ps_impl.cc')
| -rw-r--r-- | gr-vocoder/lib/codec2_decode_ps_impl.cc | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.cc b/gr-vocoder/lib/codec2_decode_ps_impl.cc index a4f7cccf82..fa4c1839d0 100644 --- a/gr-vocoder/lib/codec2_decode_ps_impl.cc +++ b/gr-vocoder/lib/codec2_decode_ps_impl.cc @@ -24,12 +24,12 @@ #include "config.h" #endif -#include "codec2_decode_ps_impl.h" - extern "C" { #include "codec2/codec2.h" } +#include "codec2_decode_ps_impl.h" + #include <gnuradio/io_signature.h> #include <stdexcept> #include <assert.h> @@ -38,22 +38,34 @@ namespace gr { namespace vocoder { codec2_decode_ps::sptr - codec2_decode_ps::make() + codec2_decode_ps::make(int mode) { + CODEC2 *codec2; + int samples_per_frame, bits_per_frame; + + // Check the number of input samples and output bits per frame. + codec2 = codec2_create(mode); + samples_per_frame = codec2_samples_per_frame(codec2); + bits_per_frame = codec2_bits_per_frame(codec2); + codec2_destroy(codec2); + return gnuradio::get_initial_sptr - (new codec2_decode_ps_impl()); + (new codec2_decode_ps_impl(mode, samples_per_frame, bits_per_frame)); } - codec2_decode_ps_impl::codec2_decode_ps_impl () + codec2_decode_ps_impl::codec2_decode_ps_impl (int mode, int samples_per_frame, int bits_per_frame) : sync_interpolator("vocoder_codec2_decode_ps", - io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)), + io_signature::make(1, 1, bits_per_frame * sizeof(char)), io_signature::make (1, 1, sizeof(short)), - CODEC2_SAMPLES_PER_FRAME), - d_frame_buf(CODEC2_BYTES_PER_FRAME, 0) + samples_per_frame), + d_frame_buf((bits_per_frame + 7) / 8, 0) { - if((d_codec2 = codec2_create()) == 0) + if((d_codec2 = codec2_create(mode)) == 0) throw std::runtime_error("codec2_decode_ps_impl: codec2_create failed"); + d_samples_per_frame = samples_per_frame; + d_bits_per_frame = bits_per_frame; + d_bytes_per_frame = (bits_per_frame + 7) / 8; } codec2_decode_ps_impl::~codec2_decode_ps_impl() @@ -69,13 +81,13 @@ namespace gr { const unsigned char *in = (const unsigned char*)input_items[0]; short *out = (short *) output_items[0]; - assert((noutput_items % CODEC2_SAMPLES_PER_FRAME) == 0); + assert((noutput_items % d_samples_per_frame) == 0); - for(int i = 0; i < noutput_items; i += CODEC2_SAMPLES_PER_FRAME) { + for(int i = 0; i < noutput_items; i += d_samples_per_frame) { pack_frame(in, &d_frame_buf[0]); - codec2_decode (d_codec2, out, const_cast<unsigned char*>(&d_frame_buf[0])); - in += CODEC2_BITS_PER_FRAME * sizeof (char); - out += CODEC2_SAMPLES_PER_FRAME; + codec2_decode (d_codec2, out, const_cast<unsigned char*>(&d_frame_buf[0]), 0.0); + in += d_bits_per_frame * sizeof (char); + out += d_samples_per_frame; } return noutput_items; @@ -84,10 +96,10 @@ namespace gr { void codec2_decode_ps_impl::pack_frame(const unsigned char *in_unpacked, unsigned char *out_packed) { - memset((void *) &d_frame_buf[0], 0x00, CODEC2_BYTES_PER_FRAME); + memset((void *) &d_frame_buf[0], 0x00, d_bytes_per_frame); int byte_idx = 0, bit_idx = 0; - for(int k = 0; k < CODEC2_BITS_PER_FRAME; k++) { + for(int k = 0; k < d_bits_per_frame; k++) { out_packed[byte_idx] |= ((in_unpacked[k] & 0x01) << (7-bit_idx)); bit_idx = (bit_idx + 1) % 8; if (bit_idx == 0) { |