[Commit-gnuradio] [gnuradio] 06/06: Merge branch 'pfb_reconstruction'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 103ca46c2e08403c39918ef4917344d29e44f50c
Merge: 67882ee 92044de
Author: Tom Rondeau <address@hidden>
Date:   Fri Feb 28 11:35:38 2014 -0500

    Merge branch 'pfb_reconstruction'
    
    Conflicts:
        gr-filter/python/filter/pfb.py

 gr-blocks/grc/blocks_null_sink.xml                 |  17 ++
 gr-blocks/grc/blocks_null_source.xml               |  16 ++
 gr-blocks/grc/blocks_sub_xx.xml                    |   2 +-
 gr-blocks/lib/null_sink_impl.cc                    |   4 +-
 gr-blocks/lib/null_source_impl.cc                  |   9 +-
 gr-filter/examples/reconstruction.py               |   6 +-
 gr-filter/grc/filter_fft_filter_xxx.xml            |   9 +-
 gr-filter/grc/filter_pfb_channelizer.xml           |  13 +-
 gr-filter/grc/filter_pfb_decimator.xml             |  34 ++-
 gr-filter/grc/filter_pfb_synthesizer.xml           |   8 +
 gr-filter/include/gnuradio/filter/CMakeLists.txt   |   1 +
 gr-filter/include/gnuradio/filter/fft_filter.h     | 110 ++++++++-
 gr-filter/include/gnuradio/filter/fft_filter_ccf.h |  89 +++++++
 .../include/gnuradio/filter/pfb_channelizer_ccf.h  |  12 +-
 .../include/gnuradio/filter/pfb_decimator_ccf.h    |  13 +-
 .../include/gnuradio/filter/pfb_synthesizer_ccf.h  |  55 ++++-
 .../include/gnuradio/filter/polyphase_filterbank.h |  12 +-
 gr-filter/lib/CMakeLists.txt                       |   1 +
 gr-filter/lib/fft_filter.cc                        | 166 ++++++++++++-
 gr-filter/lib/fft_filter_ccf_impl.cc               | 120 +++++++++
 ..._decimator_ccf_impl.h => fft_filter_ccf_impl.h} |  47 ++--
 gr-filter/lib/pfb_channelizer_ccf_impl.cc          |  72 ++++--
 gr-filter/lib/pfb_channelizer_ccf_impl.h           |   2 +-
 gr-filter/lib/pfb_decimator_ccf_impl.cc            | 183 +++++++++++---
 gr-filter/lib/pfb_decimator_ccf_impl.h             |  26 +-
 gr-filter/lib/pfb_interpolator_ccf_impl.cc         |   4 +-
 gr-filter/lib/pfb_synthesizer_ccf_impl.cc          | 268 +++++++++++----------
 gr-filter/lib/polyphase_filterbank.cc              |  33 ++-
 gr-filter/python/filter/pfb.py                     |  18 +-
 gr-filter/python/filter/qa_fft_filter.py           | 131 ++++++++++
 gr-filter/python/filter/qa_pfb_channelizer.py      |  16 +-
 gr-filter/python/filter/qa_pfb_decimator.py        |  77 ++++--
 gr-filter/python/filter/qa_pfb_interpolator.py     |  20 +-
 gr-filter/python/filter/qa_pfb_synthesizer.py      |  34 +--
 gr-filter/swig/filter_swig.i                       |   3 +
 35 files changed, 1298 insertions(+), 333 deletions(-)