[Commit-gnuradio] [gnuradio] 08/09: Merge remote-tracking branch 'mbant/vocoder-fixes'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 8b07eb87b146ceb21838ee423d4ebf1a71a0e799
Merge: 2167992 e44fe28
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 7 12:32:45 2014 -0500

    Merge remote-tracking branch 'mbant/vocoder-fixes'

 gr-vocoder/doc/vocoder.dox                         |   10 +
 gr-vocoder/examples/loopback-codec2.grc            | 1184 ++++++++++++++++++++
 gr-vocoder/examples/loopback-gsmfr.grc             | 1078 ++++++++++++++++++
 gr-vocoder/grc/vocoder_codec2_decode_ps.xml        |    1 +
 gr-vocoder/grc/vocoder_codec2_encode_sp.xml        |    2 +-
 gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml        |    1 +
 gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml        |    1 +
 .../include/gnuradio/vocoder/codec2_decode_ps.h    |   10 +-
 .../include/gnuradio/vocoder/codec2_encode_sp.h    |   15 +-
 .../include/gnuradio/vocoder/gsm_fr_decode_ps.h    |    5 +-
 .../include/gnuradio/vocoder/gsm_fr_encode_sp.h    |    9 +-
 gr-vocoder/lib/codec2/codec2.h                     |    1 +
 gr-vocoder/lib/codec2_decode_ps_impl.cc            |   23 +-
 gr-vocoder/lib/codec2_decode_ps_impl.h             |    7 +-
 gr-vocoder/lib/codec2_encode_sp_impl.cc            |   23 +-
 gr-vocoder/lib/codec2_encode_sp_impl.h             |    7 +-
 gr-vocoder/lib/gsm_fr_encode_sp_impl.cc            |    2 +-
 gr-vocoder/python/vocoder/qa_codec2_vocoder.py     |    4 +-
 18 files changed, 2361 insertions(+), 22 deletions(-)