[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 21 Apr 2014 16:56:16 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 10a7c793f8a998420664c7a68f39bff83132ea35
Merge: 7cf2210 33e5aeb
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 21 09:54:04 2014 -0700
Merge branch 'master' into next
gr-vocoder/examples/codec2_audio_loopback.py | 5 +-
gr-vocoder/grc/vocoder_codec2_decode_ps.xml | 35 +-
gr-vocoder/grc/vocoder_codec2_encode_sp.xml | 35 +-
gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 1 +
.../gnuradio/vocoder/codec2.h} | 41 +-
.../include/gnuradio/vocoder/codec2_decode_ps.h | 7 +-
.../include/gnuradio/vocoder/codec2_encode_sp.h | 13 +-
gr-vocoder/lib/CMakeLists.txt | 1 +
.../lib/{codec2_encode_sp_impl.h => codec2.cc} | 28 +-
gr-vocoder/lib/codec2/CMakeLists.txt | 112 +-
gr-vocoder/lib/codec2/ampexp.c | 1093 +++
gr-vocoder/lib/codec2/{phase.h => ampexp.h} | 23 +-
gr-vocoder/lib/codec2/c2dec.c | 199 +-
gr-vocoder/lib/codec2/c2demo.c | 38 +-
gr-vocoder/lib/codec2/c2enc.c | 71 +-
gr-vocoder/lib/codec2/c2sim.c | 1131 ++-
gr-vocoder/lib/codec2/codebook/dlsp1.txt | 20 +-
gr-vocoder/lib/codec2/codebook/dlsp10.txt | 28 +-
gr-vocoder/lib/codec2/codebook/dlsp2.txt | 20 +-
gr-vocoder/lib/codec2/codebook/dlsp3.txt | 30 +-
gr-vocoder/lib/codec2/codebook/dlsp4.txt | 32 +-
gr-vocoder/lib/codec2/codebook/dlsp5.txt | 32 +-
gr-vocoder/lib/codec2/codebook/dlsp6.txt | 32 +-
gr-vocoder/lib/codec2/codebook/dlsp7.txt | 28 +-
gr-vocoder/lib/codec2/codebook/dlsp8.txt | 28 +-
gr-vocoder/lib/codec2/codebook/dlsp9.txt | 28 +-
gr-vocoder/lib/codec2/codebook/gecb.txt | 257 +
gr-vocoder/lib/codec2/codebook/lsp45678910.txt | 4097 ++++++++++
gr-vocoder/lib/codec2/codebook/lsp8910.txt | 65 -
gr-vocoder/lib/codec2/codebook/lspdt1.txt | 9 +
gr-vocoder/lib/codec2/codebook/lspdt10.txt | 3 +
gr-vocoder/lib/codec2/codebook/lspdt2.txt | 9 +
gr-vocoder/lib/codec2/codebook/lspdt3.txt | 5 +
gr-vocoder/lib/codec2/codebook/lspdt4.txt | 5 +
gr-vocoder/lib/codec2/codebook/lspdt5.txt | 5 +
gr-vocoder/lib/codec2/codebook/lspdt6.txt | 5 +
gr-vocoder/lib/codec2/codebook/lspdt7.txt | 3 +
gr-vocoder/lib/codec2/codebook/lspdt8.txt | 3 +
gr-vocoder/lib/codec2/codebook/lspdt9.txt | 3 +
gr-vocoder/lib/codec2/codebook/lspjnd5-10.txt | 8317 ++++++++++++++++++++
gr-vocoder/lib/codec2/codebook/lspjvm1.txt | 513 ++
gr-vocoder/lib/codec2/codebook/lspjvm2.txt | 513 ++
gr-vocoder/lib/codec2/codebook/lspjvm3.txt | 513 ++
gr-vocoder/lib/codec2/codebook/lspvqanssi1.txt | 257 +
gr-vocoder/lib/codec2/codebook/lspvqanssi2.txt | 129 +
gr-vocoder/lib/codec2/codebook/lspvqanssi3.txt | 65 +
gr-vocoder/lib/codec2/codebook/lspvqanssi4.txt | 65 +
gr-vocoder/lib/codec2/codec2.c | 1385 +++-
gr-vocoder/lib/codec2/codec2.h | 54 +-
gr-vocoder/lib/codec2/codec2_fdmdv.h | 124 +
gr-vocoder/lib/codec2/{nlp.h => codec2_fifo.h} | 36 +-
gr-vocoder/lib/codec2/codec2_internal.h | 71 +-
gr-vocoder/lib/codec2/defines.h | 12 +-
gr-vocoder/lib/codec2/dump.c | 212 +-
gr-vocoder/lib/codec2/dump.h | 12 +-
gr-vocoder/lib/codec2/fdmdv.c | 1569 ++++
gr-vocoder/lib/codec2/fdmdv_internal.h | 176 +
gr-vocoder/lib/codec2/fft.c | 101 -
gr-vocoder/lib/codec2/fft.h | 16 -
gr-vocoder/lib/codec2/fifo.c | 142 +
gr-vocoder/lib/codec2/fq20.sh | 8 -
gr-vocoder/lib/codec2/hanning.h | 644 ++
gr-vocoder/lib/codec2/interp.c | 397 +-
gr-vocoder/lib/codec2/interp.h | 14 +-
gr-vocoder/lib/codec2/listensim.sh | 9 -
gr-vocoder/lib/codec2/lpc.c | 94 +-
gr-vocoder/lib/codec2/lpc.h | 5 +-
gr-vocoder/lib/codec2/lsp.c | 2 +-
gr-vocoder/lib/codec2/machdep.h | 51 +
gr-vocoder/lib/codec2/nlp.c | 285 +-
gr-vocoder/lib/codec2/nlp.h | 7 +-
gr-vocoder/lib/codec2/os.h | 53 +
gr-vocoder/lib/codec2/pack.c | 22 +-
gr-vocoder/lib/codec2/phase.c | 123 +-
gr-vocoder/lib/codec2/phase.h | 7 +-
gr-vocoder/lib/codec2/phaseexp.c | 1455 ++++
gr-vocoder/lib/codec2/{phase.h => phaseexp.h} | 21 +-
gr-vocoder/lib/codec2/pilot_coeff.h | 34 +
gr-vocoder/lib/codec2/postfilter.c | 21 +-
gr-vocoder/lib/codec2/quantise.c | 1975 ++++-
gr-vocoder/lib/codec2/quantise.h | 101 +-
gr-vocoder/lib/codec2/rn.h | 964 +++
gr-vocoder/lib/codec2/sim.sh | 22 -
gr-vocoder/lib/codec2/sine.c | 136 +-
gr-vocoder/lib/codec2/sine.h | 12 +-
gr-vocoder/lib/codec2/test_bits.h | 164 +
gr-vocoder/lib/codec2_decode_ps_impl.cc | 44 +-
gr-vocoder/lib/codec2_decode_ps_impl.h | 5 +-
gr-vocoder/lib/codec2_encode_sp_impl.cc | 35 +-
gr-vocoder/lib/codec2_encode_sp_impl.h | 5 +-
gr-vocoder/python/vocoder/qa_codec2_vocoder.py | 22 +-
gr-vocoder/swig/vocoder_swig.i | 2 +
92 files changed, 26679 insertions(+), 1922 deletions(-)