diff options
author | Vasil Velichkov <vvvelichkov@gmail.com> | 2018-05-06 02:13:36 +0300 |
---|---|---|
committer | Piotr Krysik <ptrkrysik@gmail.com> | 2018-12-29 00:52:05 +0100 |
commit | 7f259fdb68025d6e7b3cfc36c3958d9c6e5f60b8 (patch) | |
tree | 020b7e2f240dbeb31182cade86e5f62ac1863c73 /include | |
parent | 0ccec373b3d68825d02b4494b3e2c90bda86a471 (diff) |
Add TCH/H decoder block with AMR multirate support
Add new TCHH channel mode
Add two new optional arguments
-m CHAN_MODE, --mode=CHAN_MODE
Channel mode. Valid options are 'BCCH' (Non-combined
C0), 'BCCH_SDCCH4'(Combined C0), 'SDCCH8' (Stand-alone
control channel) 'TCHF' (Traffic Channel, Full rate),
'TCHH' (Traffic Channel, Half rate)
--sub-channel=TCH_H_CHANNEL
TCH/H sub-channel. [default=0]
--multi-rate=MULTI_RATE
The MultiRrate configuration element from the
Assigment Command message. Example: 28111a40. See 3GPP
TS 44.018 - 10.5.2.21aa MultiRate configuration
Example:
grgsm_decode -m TCHH --sub-channel 0 --multi-rate 2811 -o voice.amr ...
Diffstat (limited to 'include')
-rw-r--r-- | include/grgsm/decoding/CMakeLists.txt | 4 | ||||
-rw-r--r-- | include/grgsm/decoding/tch_f_decoder.h | 3 | ||||
-rw-r--r-- | include/grgsm/decoding/tch_h_decoder.h | 59 |
3 files changed, 64 insertions, 2 deletions
diff --git a/include/grgsm/decoding/CMakeLists.txt b/include/grgsm/decoding/CMakeLists.txt index 64bbb16..1014955 100644 --- a/include/grgsm/decoding/CMakeLists.txt +++ b/include/grgsm/decoding/CMakeLists.txt @@ -22,5 +22,7 @@ ######################################################################## install(FILES control_channels_decoder.h - tch_f_decoder.h DESTINATION include/grgsm/decoding + tch_f_decoder.h + tch_h_decoder.h + DESTINATION include/grgsm/decoding ) diff --git a/include/grgsm/decoding/tch_f_decoder.h b/include/grgsm/decoding/tch_f_decoder.h index df5f0ff..ae65f06 100644 --- a/include/grgsm/decoding/tch_f_decoder.h +++ b/include/grgsm/decoding/tch_f_decoder.h @@ -41,7 +41,8 @@ namespace gr { TCH_AFS5_15, TCH_AFS4_75, TCH_FS, - TCH_EFR + TCH_EFR, + TCH_HS, }; /*! diff --git a/include/grgsm/decoding/tch_h_decoder.h b/include/grgsm/decoding/tch_h_decoder.h new file mode 100644 index 0000000..5ea9714 --- /dev/null +++ b/include/grgsm/decoding/tch_h_decoder.h @@ -0,0 +1,59 @@ +/* -*- c++ -*- */ +/* + * @file + * @author (C) 2018 by Vasil Velichkov <vvvelichkov@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + + +#ifndef INCLUDED_GSM_TCH_H_DECODER_H +#define INCLUDED_GSM_TCH_H_DECODER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GRGSM_API tch_h_decoder : virtual public gr::block + { + public: + typedef boost::shared_ptr<tch_h_decoder> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of gsm::tch_h_decoder. + * + * To avoid accidental use of raw pointers, gsm::tch_h_decoder's + * constructor is in a private implementation + * class. gsm::tch_h_decoder::make is the public interface for + * creating new instances. + */ + static sptr make(unsigned int sub_channel, std::string multi_rate, bool boundary_check=false); + + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_TCH_H_DECODER_H */ + |